diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 36f3438..73bff76 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 saveUser="tim" saveDateTime="2022-08-30T11:53:16" version="3.26.2-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run">
+<qgis version="3.26.2-Buenos Aires" projectname="Gun Run" saveUserFull="Timothy Allen" saveDateTime="2022-09-04T18:41:34" saveUser="tim">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,219 +21,215 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group name="Marshals" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Unchecked" name="Marshals" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" source="./marshal_positions.shp|layername=marshal_positions" legend_exp="" name="marshal_positions" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="marshal_positions"/>
-            <Option type="QString" name="legend/expressionFilter" value=""/>
-            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
-            <Option type="int" name="showFeatureCount" value="1"/>
+            <Option value="marshal_positions" type="QString" 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>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="extra_security20170921130834191" source="./extra_security.shp" legend_exp="" name="extra_security" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshals_by_position20161003112326575" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_exp="" name="marshals_by_position" expanded="1" patch_size="0,0" providerKey="delimitedtext" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="marshals_by_position"/>
+            <Option value="marshals_by_position" type="QString" name="cached_name"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_exp="" name="complete_marshal_overview" expanded="1" patch_size="0,0" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" source="./marshal overviews.shp|layername=marshal overviews" legend_exp="" name="marshal_overviews" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="legend/expressionFilter" value=""/>
-            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Fencing and Cones" expanded="0" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" legend_exp="" name="fencing" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="fencing"/>
-            <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-            <Option type="QString" name="legend/expressionFilter" value=""/>
-            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
+            <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>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" 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="" name="fence_groups" expanded="1" patch_size="0,0" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group name="Markers" expanded="1" groupLayer="" checked="Qt::Checked">
+      <layer-tree-group checked="Qt::Checked" name="Markers" groupLayer="" expanded="1">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" source="Point?crs=EPSG:4326&amp;uid={2bd4c115-aee9-42aa-af5c-425618621c58}" legend_exp="" name="route_markers" expanded="1" patch_size="-1,-1" providerKey="memory" checked="Qt::Checked" legend_split_behavior="0">
+        <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">
           <customproperties>
             <Option type="Map">
-              <Option type="int" name="showFeatureCount" value="1"/>
-            </Option>
-          </customproperties>
-        </layer-tree-layer>
-        <layer-tree-layer id="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7" source="Point?crs=EPSG:4326&amp;uid={40e6cb9e-7c5b-40c3-b431-03ac2c4bba96}" legend_exp="" name="route_markers" expanded="1" patch_size="-1,-1" providerKey="memory" checked="Qt::Unchecked" legend_split_behavior="0">
-          <customproperties>
-            <Option type="Map">
-              <Option type="int" name="showFeatureCount" value="1"/>
+              <Option value="1" type="int" name="showFeatureCount"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="all_routes"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="int" name="showFeatureCount" value="0"/>
+            <Option value="all_routes" type="QString" name="cached_name"/>
+            <Option name="expandedLegendNodes"/>
+            <Option value="0" type="int" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" 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="" name="timelapse" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+    <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">
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="cached_name" value="timelapse"/>
+          <Option value="timelapse" type="QString" name="cached_name"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group name="Feeding Stations" expanded="1" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Checked" name="Feeding Stations" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="water_tables20170921142016467" source="./water_tables.shp" legend_exp="" name="water_tables" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="water_tables"/>
+            <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="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Ask Me" expanded="0" groupLayer="" checked="Qt::Unchecked">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" source="./poi_labels.shp|layername=poi_labels" legend_exp="" name="poi_labels" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="poi_labels"/>
+            <Option value="vipaccess" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" name="directions_to_start" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
-        <customproperties>
-          <Option type="Map">
-            <Option type="QString" name="cached_name" value="directions_to_start"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Residents Access" expanded="0" groupLayer="" checked="Qt::Unchecked">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" source="./mayor.shp" legend_exp="" name="mayor" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
-        <customproperties>
-          <Option type="Map">
-            <Option type="QString" name="cached_name" value="mayor"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" source="./viplabels.shp" legend_exp="" name="viplabels" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
-        <customproperties>
-          <Option type="Map">
-            <Option type="QString" name="cached_name" value="viplabels"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" source="./vipaccess.shp" legend_exp="" name="vipaccess" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
-        <customproperties>
-          <Option type="Map">
-            <Option type="QString" name="cached_name" value="vipaccess"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" source="./golfaccess.shp" legend_exp="" name="golfaccess" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" name="residents_access_roads" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="residents_access_roads"/>
+            <Option value="residents_access_roads" type="QString" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" source="./residents_access.shp|layername=residents_access" legend_exp="" name="residents_access" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="OSM data" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="OSM data" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" source="./osm_roads.shp" legend_exp="" name="osm_roads" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="osm_roads [3887]"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="QString" name="showFeatureCount" value="1"/>
+            <Option value="osm_roads [3887]" type="QString" name="cached_name"/>
+            <Option name="expandedLegendNodes"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" source="./osm_places.shp|layername=osm_places" legend_exp="" name="osm_places" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="osm_places [7]"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="QString" name="showFeatureCount" value="1"/>
+            <Option value="osm_places [7]" type="QString" name="cached_name"/>
+            <Option name="expandedLegendNodes"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Start and Finish pages" expanded="0" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" source="./data-comments.shp" legend_exp="" name="data-comments" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" source="./start_finish_area.shp" legend_exp="" name="start_finish_area" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
@@ -241,35 +237,35 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Elevation" expanded="0" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Elevation" groupLayer="" expanded="0">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" source="./capetownelevation-1m.shp" legend_exp="" name="capetownelevation-1m" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="showFeatureCount" value="1"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Map" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Map" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial" expanded="0" patch_size="0,0" providerKey="gdal" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="GDAL-City of Cape Town 2015 Aerial"/>
+            <Option value="GDAL-City of Cape Town 2015 Aerial" type="QString" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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="" name="Outlines" expanded="1" patch_size="0,0" providerKey="wms" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="Outlines"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="Outlines" type="QString" name="cached_name"/>
+            <Option name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -299,47 +295,45 @@
       <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_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7</item>
-      <item>route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1</item>
+      <item>route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings tolerance="10" mode="3" type="1" scaleDependencyMode="0" unit="1" minScale="0" intersection-snapping="1" maxScale="0" enabled="0" self-snapping="1">
+  <snapping-settings unit="1" intersection-snapping="1" scaleDependencyMode="0" minScale="0" mode="3" maxScale="0" type="1" tolerance="10" self-snapping="1" enabled="0">
     <individual-layer-settings>
-      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="extra_security20170921130834191" tolerance="0" type="2" units="2" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" type="2" units="1" minScale="0" maxScale="0" enabled="1"/>
-      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" tolerance="12" type="0" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7" tolerance="12" type="0" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="water_tables20170921142016467" tolerance="0" type="2" units="2" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <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"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <polymorphicRelations/>
-  <mapcanvas name="theMapCanvas" annotationsVisible="1">
+  <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.35711011631522638</xmin>
-      <ymin>-33.95802701381087729</ymin>
-      <xmax>18.43083771939430449</xmax>
-      <ymax>-33.87127486098422935</ymax>
+      <xmin>18.40304680199827914</xmin>
+      <ymin>-33.91746432349552265</ymin>
+      <xmax>18.41687072757535049</xmax>
+      <ymax>-33.90119829484044089</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -360,166 +354,161 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup name="Marshals" open="true" checked="Qt::Checked">
-      <legendlayer drawingOrder="-1" name="marshal_positions" open="true" showFeatureCount="1" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="extra_security" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="marshals_by_position" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="complete_marshal_overview" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="marshal_overviews" open="false" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Fencing and Cones" open="false" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" name="fencing" open="true" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="fence_groups" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Routes" open="true" checked="Qt::Checked">
-      <legendgroup name="Markers" open="true" checked="Qt::Checked">
-        <legendlayer drawingOrder="-1" name="route_markers" open="true" showFeatureCount="1" checked="Qt::Checked">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
-          </filegroup>
-        </legendlayer>
-        <legendlayer drawingOrder="-1" name="route_markers" open="true" showFeatureCount="1" checked="Qt::Unchecked">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
+    <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"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer drawingOrder="-1" name="all_routes" open="true" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer drawingOrder="-1" name="timelapse" open="false" showFeatureCount="0" checked="Qt::Unchecked">
-      <filegroup open="false" hidden="false">
-        <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
+    <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"/>
       </filegroup>
     </legendlayer>
-    <legendgroup name="Feeding Stations" open="true" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" name="water_tables" open="true" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="water_tables20170921142016467"/>
+    <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Ask Me" open="false" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" name="poi_labels" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="directions_to_start" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Residents Access" open="false" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" name="mayor" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="viplabels" open="true" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="vipaccess" open="true" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="golfaccess" open="false" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="residents_access_roads" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="residents_access" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="OSM data" open="true" checked="Qt::Checked">
-      <legendlayer drawingOrder="-1" name="osm_roads" open="false" showFeatureCount="1" checked="Qt::Checked">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="osm_places" open="true" showFeatureCount="1" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Start and Finish pages" open="false" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" name="data-comments" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="start_finish_area" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Elevation" open="false" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" name="capetownelevation-1m" open="true" showFeatureCount="1" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
+    <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Map" open="true" checked="Qt::Checked">
-      <legendlayer drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" open="false" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="Outlines" open="true" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer type="annotation" autoRefreshTime="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" autoRefreshEnabled="0" refreshOnNotifyMessage="">
+  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshTime="0" type="annotation" autoRefreshEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -570,7 +559,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer type="raster" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" minScale="1e+08" autoRefreshEnabled="0" maxScale="100000" refreshOnNotifyMessage="">
+    <maplayer minScale="1e+08" refreshOnNotifyEnabled="0" autoRefreshTime="0" maxScale="100000" type="raster" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -635,7 +624,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -646,9 +635,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -666,52 +655,52 @@
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" zoffset="0" enabled="0" zscale="1" symbology="Line">
+      <elevation zscale="1" band="1" symbology="Line" zoffset="0" enabled="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="152,125,183,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -742,36 +731,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="152,125,183,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -786,9 +775,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -797,27 +786,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="WMSBackgroundLayer" value="false"/>
-          <Option type="QString" name="WMSPublishDataSourceUrl" value="false"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="identify/format" value="Value"/>
+          <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>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option type="QString" name="name" value=""/>
+          <Option value="" type="QString" name="name"/>
           <Option name="properties"/>
-          <Option type="QString" name="type" value="collection"/>
+          <Option value="collection" type="QString" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.5" alphaBand="-1" type="multibandcolor" nodataColor="" blueBand="3" greenBand="2" redBand="1">
+        <rasterrenderer opacity="0.5" alphaBand="-1" nodataColor="" type="multibandcolor" redBand="1" greenBand="2" blueBand="3">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -828,14 +817,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation colorizeOn="0" invertColors="0" colorizeGreen="128" colorizeStrength="100" saturation="0" colorizeBlue="128" colorizeRed="255" grayscaleMode="0"/>
+        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
+        <huesaturation colorizeOn="0" grayscaleMode="0" colorizeStrength="100" colorizeBlue="128" saturation="0" colorizeRed="255" colorizeGreen="128" invertColors="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer type="raster" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" minScale="1e+08" autoRefreshEnabled="0" maxScale="0" refreshOnNotifyMessage="">
+    <maplayer minScale="1e+08" refreshOnNotifyEnabled="0" autoRefreshTime="0" maxScale="0" type="raster" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -900,7 +889,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -911,7 +900,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -929,52 +918,52 @@
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" zoffset="0" enabled="0" zscale="1" symbology="Line">
+      <elevation zscale="1" band="1" symbology="Line" zoffset="0" enabled="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="225,89,137,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1005,36 +994,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -1049,9 +1038,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1060,27 +1049,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="WMSBackgroundLayer" value="true"/>
-          <Option type="QString" name="WMSPublishDataSourceUrl" value="false"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="identify/format" value="Undefined"/>
+          <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>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option type="QString" name="name" value=""/>
+          <Option value="" type="QString" name="name"/>
           <Option name="properties"/>
-          <Option type="QString" name="type" value="collection"/>
+          <Option value="collection" type="QString" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.75" alphaBand="-1" type="singlebandcolordata" nodataColor="" band="1">
+        <rasterrenderer opacity="0.75" alphaBand="-1" band="1" nodataColor="" type="singlebandcolordata">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1091,14 +1080,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation colorizeOn="0" invertColors="0" colorizeGreen="128" colorizeStrength="100" saturation="0" colorizeBlue="128" colorizeRed="255" grayscaleMode="0"/>
+        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
+        <huesaturation colorizeOn="0" grayscaleMode="0" colorizeStrength="100" colorizeBlue="128" saturation="0" colorizeRed="255" colorizeGreen="128" invertColors="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1163,7 +1152,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -1177,8 +1166,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" expression="$length * 100" precision="0" comment="" type="6" name="length_km" subType="0" typeName="double precision"/>
-        <field length="-1" expression="$length * 100 * 1000" precision="0" comment="" type="6" name="length_m" subType="0" typeName="double precision"/>
+        <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=""/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1191,58 +1180,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="RouteLen" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="RouteLen" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="229,182,54,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1273,36 +1262,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -1317,44 +1306,44 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -1377,59 +1366,59 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="Active Routes" checkstate="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" description="Only show when active in Atlas" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
-            <rule symbol="1" label="21KM" checkstate="0" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
-            <rule symbol="2" label="10KM" checkstate="0" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
-            <rule symbol="3" label="5KM" checkstate="0" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
-            <rule symbol="4" label="Trail" checkstate="0" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
+          <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>
-          <rule symbol="5" label="Show by day" 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" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule symbol="6" label="21KM" checkstate="0" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule symbol="7" label="10KM" checkstate="0" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule symbol="8" label="5KM" checkstate="0" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
-            <rule symbol="9" label="Trail" checkstate="0" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <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>
-          <rule symbol="10" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule symbol="11" label="Always show by day" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <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}"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1449,44 +1438,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -1502,32 +1491,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@0@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@0@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -1542,15 +1531,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1558,35 +1547,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1617,36 +1606,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1666,40 +1655,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@0@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1722,38 +1711,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                          <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>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1773,40 +1762,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@0@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1829,47 +1818,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                          <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>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1889,44 +1878,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -1942,32 +1931,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@1@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="210,32,39,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -1982,15 +1971,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1998,35 +1987,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="210,32,39,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2057,36 +2046,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2106,40 +2095,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2162,38 +2151,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2213,40 +2202,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2269,58 +2258,58 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="10" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="10" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2351,56 +2340,56 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="11" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="11" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.46"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2431,45 +2420,45 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2489,44 +2478,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@2@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -2542,32 +2531,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@2@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -2582,15 +2571,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2598,35 +2587,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2657,36 +2646,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2706,40 +2695,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@2@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2762,38 +2751,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2813,40 +2802,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@2@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2869,47 +2858,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2929,44 +2918,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@3@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -2982,32 +2971,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@3@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@3@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="145,211,55,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -3022,15 +3011,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3038,35 +3027,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,211,55,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3097,36 +3086,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3146,40 +3135,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@3@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3202,38 +3191,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3253,40 +3242,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@3@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3309,47 +3298,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3369,44 +3358,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@4@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@4@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,72,255,255"/>
@@ -3422,32 +3411,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@4@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@4@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,72,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,72,255,255"/>
@@ -3462,15 +3451,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3478,35 +3467,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,72,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3537,36 +3526,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3586,40 +3575,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@4@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@4@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3642,38 +3631,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3693,40 +3682,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@4@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@4@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3749,47 +3738,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="5" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="5" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3809,44 +3798,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@5@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@5@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -3862,32 +3851,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@5@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@5@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -3902,15 +3891,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3918,35 +3907,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3977,36 +3966,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4026,40 +4015,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@5@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@5@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4082,38 +4071,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                          <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>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4133,40 +4122,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@5@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@5@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4189,47 +4178,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                          <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>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="6" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="6" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4249,44 +4238,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@6@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@6@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -4302,32 +4291,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@6@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@6@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="210,32,39,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -4342,15 +4331,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4358,35 +4347,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="210,32,39,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4417,36 +4406,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4466,40 +4455,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@6@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@6@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4522,38 +4511,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4573,40 +4562,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@6@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@6@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4629,47 +4618,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="7" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="7" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4689,44 +4678,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@7@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@7@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -4742,32 +4731,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@7@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@7@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -4782,15 +4771,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4798,35 +4787,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4857,36 +4846,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4906,40 +4895,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@7@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@7@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4962,38 +4951,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5013,40 +5002,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@7@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@7@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5069,47 +5058,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="8" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="8" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5129,44 +5118,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@8@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@8@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -5182,32 +5171,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@8@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@8@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="145,211,55,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -5222,15 +5211,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5238,35 +5227,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,211,55,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5297,36 +5286,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5346,40 +5335,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@8@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@8@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5402,38 +5391,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5453,40 +5442,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@8@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@8@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5509,47 +5498,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="9" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="9" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5569,44 +5558,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@9@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@9@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,72,255,255"/>
@@ -5622,32 +5611,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@9@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@9@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,72,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,72,255,255"/>
@@ -5662,15 +5651,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5678,35 +5667,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,72,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5737,36 +5726,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5786,40 +5775,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@9@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@9@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5842,38 +5831,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5893,40 +5882,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@9@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@9@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5949,15 +5938,15 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -5970,43 +5959,43 @@
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{adefb6f1-8d28-439f-8c89-3617096e0e41}">
-          <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="{3d6b22ea-4051-4151-bae2-dc441215d183}">
+        <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}">
             <settings calloutType="simple">
-              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="round($length / 1000, 0)" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="164,113,88,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <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>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -6029,34 +6018,34 @@
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -6071,98 +6060,98 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                             <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="1" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="km_marker()" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="LineGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="0" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="quadrant" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="rotation" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
@@ -6171,13 +6160,17 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <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>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -6186,47 +6179,47 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -6257,9 +6250,9 @@
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6267,12 +6260,12 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -6280,202 +6273,202 @@
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="None">
+        <field configurationFlags="None" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="None">
+        <field configurationFlags="None" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="None">
+        <field configurationFlags="None" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Sort" configurationFlags="None">
+        <field configurationFlags="None" name="Sort">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="length_km" configurationFlags="None">
+        <field configurationFlags="None" name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="Distance" name="" index="5"/>
-        <alias field="RouteLen" name="" index="6"/>
-        <alias field="Source" name="" index="7"/>
-        <alias field="Sort" name="" index="8"/>
-        <alias field="day" name="" index="9"/>
-        <alias field="length_km" name="" index="10"/>
-        <alias field="length_m" name="" index="11"/>
+        <alias 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"/>
       </aliases>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="Sort"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Sort" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="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="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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="Sort" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
+        <constraint exp="" desc="" field="Name"/>
+        <constraint exp="" desc="" field="descriptio"/>
+        <constraint exp="" desc="" field="timestamp"/>
+        <constraint exp="" desc="" field="begin"/>
+        <constraint exp="" desc="" field="end"/>
+        <constraint exp="" desc="" field="Distance"/>
+        <constraint exp="" desc="" field="RouteLen"/>
+        <constraint exp="" desc="" field="Source"/>
+        <constraint exp="" desc="" field="Sort"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="length_km"/>
+        <constraint exp="" desc="" field="length_m"/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" expression="$length * 100" precision="0" comment="" type="6" name="length_km" subType="0" typeName="double precision"/>
-        <field length="-1" expression="$length * 100 * 1000" precision="0" comment="" type="6" name="length_m" subType="0" typeName="double precision"/>
+        <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=""/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;length_m&quot;">
+      <attributetableconfig sortOrder="1" sortExpression="&quot;length_m&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="Name" width="152" hidden="0"/>
-          <column type="field" name="descriptio" width="-1" hidden="0"/>
-          <column type="field" name="timestamp" width="-1" hidden="0"/>
-          <column type="field" name="begin" width="163" hidden="0"/>
-          <column type="field" name="end" width="-1" hidden="0"/>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="field" name="length_m" width="188" hidden="0"/>
-          <column type="field" name="Sort" width="-1" hidden="0"/>
-          <column type="field" name="day" width="-1" hidden="0"/>
-          <column type="field" name="length_km" width="266" hidden="0"/>
+          <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="-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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6521,18 +6514,18 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="Distance" reuseLastValue="0"/>
@@ -6553,7 +6546,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6626,58 +6619,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="196,60,57,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6708,36 +6701,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -6752,44 +6745,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -6812,54 +6805,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="183,72,75,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6890,9 +6883,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6903,9 +6896,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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>
       </customproperties>
       <blendMode>0</blendMode>
@@ -6915,24 +6908,24 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="ID" configurationFlags="None">
+        <field configurationFlags="None" name="ID">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="height" configurationFlags="None">
+        <field configurationFlags="None" name="height">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="elevation" configurationFlags="None">
+        <field configurationFlags="None" name="elevation">
           <editWidget type="">
             <config>
               <Option/>
@@ -6941,30 +6934,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" name="" index="0"/>
-        <alias field="height" name="" index="1"/>
-        <alias field="elevation" name="" index="2"/>
+        <alias index="0" name="" field="ID"/>
+        <alias index="1" name="" field="height"/>
+        <alias index="2" name="" field="elevation"/>
       </aliases>
       <defaults>
-        <default expression="" field="ID" applyOnUpdate="0"/>
-        <default expression="" field="height" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="ID"/>
+        <default applyOnUpdate="0" expression="" field="height"/>
+        <default applyOnUpdate="0" expression="" field="elevation"/>
       </defaults>
       <constraints>
-        <constraint field="ID" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="height" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="elevation" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" desc="" exp=""/>
-        <constraint field="height" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
+        <constraint exp="" desc="" field="ID"/>
+        <constraint exp="" desc="" field="height"/>
+        <constraint exp="" desc="" field="elevation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6987,7 +6980,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Polygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -7062,58 +7055,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="133,182,111,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7144,36 +7137,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -7188,44 +7181,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7248,38 +7241,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -7294,9 +7287,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7307,9 +7300,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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>
       </customproperties>
       <blendMode>0</blendMode>
@@ -7317,35 +7310,35 @@ def my_form_open(dialog, layer, feature):
       <layerOpacity>1</layerOpacity>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="page" configurationFlags="None">
+        <field configurationFlags="None" name="page">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
@@ -7354,34 +7347,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="page" name="" index="2"/>
-        <alias field="day" name="" index="3"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="page"/>
+        <alias index="3" name="" field="day"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="page" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="page" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="page" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="page"/>
+        <constraint exp="" desc="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7404,7 +7397,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -7469,7 +7462,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -7494,58 +7487,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="190,178,151,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7576,36 +7569,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -7620,44 +7613,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7680,54 +7673,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,85,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7758,9 +7751,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7771,32 +7764,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="Name" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -7811,67 +7804,67 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="LineGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <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>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="Name"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -7880,47 +7873,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -7951,9 +7944,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7961,12 +7954,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -7974,17 +7967,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -7993,30 +7986,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="Name" name="" index="1"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="Name"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="Name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="Name" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="Name"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="Name" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8052,8 +8045,8 @@ def my_form_open(dialog, layer, feature):
         <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="id"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -8061,7 +8054,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8126,7 +8119,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -8151,58 +8144,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,82,45,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8233,36 +8226,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -8277,44 +8270,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8337,48 +8330,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="21KM" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule symbol="1" label="10KM" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule symbol="2" label="5KM" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" symbol="0" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" symbol="1" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" symbol="2" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8398,40 +8391,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="miter"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="210,32,39,255"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0.5"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="area"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -8454,32 +8447,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="100"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8499,44 +8492,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@0@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -8552,32 +8545,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@0@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@0@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="210,32,39,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -8592,9 +8585,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8602,35 +8595,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="210,32,39,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -8661,39 +8654,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8713,44 +8706,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -8766,32 +8759,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@1@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.5"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -8806,9 +8799,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8816,24 +8809,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="100"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8853,44 +8846,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -8906,32 +8899,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@1@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -8946,9 +8939,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8956,35 +8949,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9015,39 +9008,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9067,44 +9060,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@2@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="69,100,25,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -9120,32 +9113,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@2@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="69,100,25,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="69,100,25,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.5"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -9160,9 +9153,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9170,24 +9163,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="100"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9207,44 +9200,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@2@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="69,100,25,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -9260,32 +9253,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@2@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="69,100,25,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -9300,9 +9293,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9310,35 +9303,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="69,100,25,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9369,9 +9362,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9383,11 +9376,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -9396,47 +9389,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -9467,9 +9460,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9477,12 +9470,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -9490,52 +9483,52 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="Distance" name="" index="1"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="Distance"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="Distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="id" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="Distance" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9580,17 +9573,17 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -9598,7 +9591,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -9671,58 +9664,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="125,139,143,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9753,36 +9746,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -9797,44 +9790,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -9857,46 +9850,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="marker" alpha="0.796078" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="0.796078" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="227,0,185,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="1"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -9919,15 +9912,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9940,32 +9933,32 @@ def my_form_open(dialog, layer, feature):
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
           <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="8" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -9980,151 +9973,151 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="Priority">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="ZIndex">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="1" priority="8" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
           </rule>
           <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style textColor="227,0,185,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="4" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.10000000000000001" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -10139,89 +10132,89 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="2" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
@@ -10230,145 +10223,145 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="labeling/addDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/angleOffset" value="0"/>
-          <Option type="QString" name="labeling/blendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferBlendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferColorA" value="255"/>
-          <Option type="QString" name="labeling/bufferColorB" value="255"/>
-          <Option type="QString" name="labeling/bufferColorG" value="255"/>
-          <Option type="QString" name="labeling/bufferColorR" value="255"/>
-          <Option type="QString" name="labeling/bufferDraw" value="false"/>
-          <Option type="QString" name="labeling/bufferJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/bufferNoFill" value="false"/>
-          <Option type="QString" name="labeling/bufferSize" value="1"/>
-          <Option type="QString" name="labeling/bufferSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/bufferTransp" value="0"/>
-          <Option type="QString" name="labeling/centroidInside" value="false"/>
-          <Option type="QString" name="labeling/centroidWhole" value="false"/>
-          <Option type="QString" name="labeling/decimals" value="3"/>
-          <Option type="QString" name="labeling/displayAll" value="false"/>
-          <Option type="QString" name="labeling/dist" value="0"/>
-          <Option type="QString" name="labeling/distInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/drawLabels" value="false"/>
-          <Option type="QString" name="labeling/enabled" value="false"/>
-          <Option type="QString" name="labeling/fieldName" value="position"/>
-          <Option type="QString" name="labeling/fitInPolygonOnly" value="false"/>
-          <Option type="QString" name="labeling/fontCapitals" value="0"/>
-          <Option type="QString" name="labeling/fontFamily" value="Myriad Pro"/>
-          <Option type="QString" name="labeling/fontItalic" value="false"/>
-          <Option type="QString" name="labeling/fontLetterSpacing" value="0"/>
-          <Option type="QString" name="labeling/fontLimitPixelSize" value="false"/>
-          <Option type="QString" name="labeling/fontMaxPixelSize" value="10000"/>
-          <Option type="QString" name="labeling/fontMinPixelSize" value="3"/>
-          <Option type="QString" name="labeling/fontSize" value="10"/>
-          <Option type="QString" name="labeling/fontSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/fontStrikeout" value="false"/>
-          <Option type="QString" name="labeling/fontUnderline" value="false"/>
-          <Option type="QString" name="labeling/fontWeight" value="63"/>
-          <Option type="QString" name="labeling/fontWordSpacing" value="0"/>
-          <Option type="QString" name="labeling/formatNumbers" value="false"/>
-          <Option type="QString" name="labeling/isExpression" value="false"/>
-          <Option type="QString" name="labeling/labelOffsetInMapUnits" value="true"/>
-          <Option type="QString" name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/labelPerPart" value="false"/>
-          <Option type="QString" name="labeling/leftDirectionSymbol" value="&lt;"/>
-          <Option type="QString" name="labeling/limitNumLabels" value="false"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleIn" value="20"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleOut" value="-20"/>
-          <Option type="QString" name="labeling/maxNumLabels" value="2000"/>
-          <Option type="QString" name="labeling/mergeLines" value="false"/>
-          <Option type="QString" name="labeling/minFeatureSize" value="0"/>
-          <Option type="QString" name="labeling/multilineAlign" value="0"/>
-          <Option type="QString" name="labeling/multilineHeight" value="1"/>
-          <Option type="QString" name="labeling/namedStyle" value="Semibold"/>
-          <Option type="QString" name="labeling/obstacle" value="true"/>
-          <Option type="QString" name="labeling/obstacleFactor" value="1"/>
-          <Option type="QString" name="labeling/obstacleType" value="0"/>
-          <Option type="QString" name="labeling/offsetType" value="0"/>
-          <Option type="QString" name="labeling/placeDirectionSymbol" value="0"/>
-          <Option type="QString" name="labeling/placement" value="0"/>
-          <Option type="QString" name="labeling/placementFlags" value="10"/>
-          <Option type="QString" name="labeling/plussign" value="false"/>
-          <Option type="QString" name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option type="QString" name="labeling/preserveRotation" value="true"/>
-          <Option type="QString" name="labeling/previewBkgrdColor" value="#ffffff"/>
-          <Option type="QString" name="labeling/priority" value="5"/>
-          <Option type="QString" name="labeling/quadOffset" value="4"/>
-          <Option type="QString" name="labeling/repeatDistance" value="0"/>
-          <Option type="QString" name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/repeatDistanceUnit" value="1"/>
-          <Option type="QString" name="labeling/reverseDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/rightDirectionSymbol" value=">"/>
-          <Option type="QString" name="labeling/scaleMax" value="10000000"/>
-          <Option type="QString" name="labeling/scaleMin" value="1"/>
-          <Option type="QString" name="labeling/scaleVisibility" value="false"/>
-          <Option type="QString" name="labeling/shadowBlendMode" value="6"/>
-          <Option type="QString" name="labeling/shadowColorB" value="0"/>
-          <Option type="QString" name="labeling/shadowColorG" value="0"/>
-          <Option type="QString" name="labeling/shadowColorR" value="0"/>
-          <Option type="QString" name="labeling/shadowDraw" value="false"/>
-          <Option type="QString" name="labeling/shadowOffsetAngle" value="135"/>
-          <Option type="QString" name="labeling/shadowOffsetDist" value="1"/>
-          <Option type="QString" name="labeling/shadowOffsetGlobal" value="true"/>
-          <Option type="QString" name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowRadius" value="1.5"/>
-          <Option type="QString" name="labeling/shadowRadiusAlphaOnly" value="false"/>
-          <Option type="QString" name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowRadiusUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowScale" value="100"/>
-          <Option type="QString" name="labeling/shadowTransparency" value="30"/>
-          <Option type="QString" name="labeling/shadowUnder" value="0"/>
-          <Option type="QString" name="labeling/shapeBlendMode" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeBorderColorB" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorG" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorR" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderWidth" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeDraw" value="true"/>
-          <Option type="QString" name="labeling/shapeFillColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeFillColorB" value="138"/>
-          <Option type="QString" name="labeling/shapeFillColorG" value="0"/>
-          <Option type="QString" name="labeling/shapeFillColorR" value="101"/>
-          <Option type="QString" name="labeling/shapeJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeOffsetX" value="0"/>
-          <Option type="QString" name="labeling/shapeOffsetY" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeRadiiUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeRadiiX" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiY" value="0"/>
-          <Option type="QString" name="labeling/shapeRotation" value="0"/>
-          <Option type="QString" name="labeling/shapeRotationType" value="0"/>
-          <Option type="QString" name="labeling/shapeSVGFile" value=""/>
-          <Option type="QString" name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeSizeType" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeSizeX" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeY" value="0"/>
-          <Option type="QString" name="labeling/shapeTransparency" value="0"/>
-          <Option type="QString" name="labeling/shapeType" value="0"/>
-          <Option type="QString" name="labeling/textColorA" value="255"/>
-          <Option type="QString" name="labeling/textColorB" value="255"/>
-          <Option type="QString" name="labeling/textColorG" value="255"/>
-          <Option type="QString" name="labeling/textColorR" value="255"/>
-          <Option type="QString" name="labeling/textTransp" value="0"/>
-          <Option type="QString" name="labeling/upsidedownLabels" value="0"/>
-          <Option type="QString" name="labeling/wrapChar" value=""/>
-          <Option type="QString" name="labeling/xOffset" value="0"/>
-          <Option type="QString" name="labeling/yOffset" value="0"/>
-          <Option type="QString" name="labeling/zIndex" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -10377,47 +10370,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -10448,9 +10441,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10458,12 +10451,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="10" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="10" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10471,70 +10464,70 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="position" name="" index="1"/>
-        <alias field="type" name="" index="2"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="position"/>
+        <alias index="2" name="" field="type"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="position"/>
+        <constraint exp="" desc="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="position" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10610,7 +10603,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Polygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -10685,58 +10678,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="164,113,88,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10767,36 +10760,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -10811,44 +10804,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10871,38 +10864,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,85,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,85,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="b_diagonal"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,85,0,255"/>
@@ -10917,9 +10910,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10930,11 +10923,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="name"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -10943,47 +10936,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -11014,9 +11007,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11024,12 +11017,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="1" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="1" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -11037,38 +11030,38 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="group" configurationFlags="None">
+        <field configurationFlags="None" name="group">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="cone_len" configurationFlags="None">
+        <field configurationFlags="None" name="cone_len">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="fence_len" configurationFlags="None">
+        <field configurationFlags="None" name="fence_len">
           <editWidget type="">
             <config>
               <Option/>
@@ -11077,45 +11070,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" name="" index="0"/>
-        <alias field="group" name="" index="1"/>
-        <alias field="type" name="" index="2"/>
-        <alias field="cone_len" name="" index="3"/>
-        <alias field="fence_len" name="" index="4"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
       </defaults>
       <constraints>
-        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="group" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="cone_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="fence_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="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="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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="group" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
-        <constraint field="fence_len" desc="" exp=""/>
+        <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"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="group" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="cone_len" width="-1" hidden="0"/>
-          <column type="field" name="fence_len" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="name" hidden="0"/>
+          <column width="-1" type="field" name="group" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11151,8 +11144,8 @@ def my_form_open(dialog, layer, feature):
         <field name="name" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -11160,7 +11153,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11225,7 +11218,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -11239,26 +11232,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="cone_len" subType="0" typeName="double precision"/>
+        <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=""/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis labelsEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="3.8.3-Zanzibar" simplifyLocal="1" readOnly="0" simplifyMaxScale="1" minScale="1e+08" maxScale="0" simplifyDrawingHints="1">
+          <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">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 type="RuleRenderer" symbollevels="1" enableorderby="0" forceraster="0">
+            <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" enableorderby="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
               </rules>
               <symbols>
-                <symbol alpha="1" type="line" name="0" clip_to_extent="1" force_rhr="0">
-                  <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+                <symbol type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0">
+                  <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                     <prop k="capstyle" v="square"/>
                     <prop k="customdash" v="5;2"/>
                     <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -11277,9 +11270,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 type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -11290,62 +11283,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style textColor="0,0,0,255" fontUnderline="0" fontCapitals="0" blendMode="0" fieldName="comment" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="11" previewBkgrdColor="#ffffff" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" isExpression="0" textOpacity="0.8" fontStrikeout="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point">
-                      <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferBlendMode="0" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeBlendMode="0" shapeBorderWidth="0.6" shapeSizeUnit="MM" shapeJoinStyle="128" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="1" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.6" shapeOffsetX="0"/>
-                      <shadow shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0"/>
+                    <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"/>
                       <substitutions/>
                     </text-style>
-                    <text-format leftDirectionSymbol="&lt;" addDirectionSymbol="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                    <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" priority="5" distUnits="MM" dist="5" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" offsetUnits="MM" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" fitInPolygonOnly="0" centroidWhole="0" placement="4" placementFlags="2" xOffset="0" centroidInside="0" rotationAngle="0" geometryGenerator="" geometryGeneratorType="PointGeometry" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                    <rendering displayAll="1" scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                    <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"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                            <Option type="int" name="type" value="2"/>
+                            <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>
                           <Option type="Map" name="PositionY">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                            <Option type="int" name="type" value="2"/>
+                            <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>
                         </Option>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
                 <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style textColor="0,0,0,255" fontUnderline="0" fontCapitals="0" blendMode="0" fieldName="round( $length, 1) || 'm'" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="#ffffff" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" isExpression="1" textOpacity="1" fontStrikeout="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point">
-                      <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferBlendMode="0" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0"/>
-                      <shadow shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0"/>
+                    <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"/>
                       <substitutions/>
                     </text-style>
-                    <text-format leftDirectionSymbol="&lt;" addDirectionSymbol="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                    <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" priority="5" distUnits="MM" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" offsetUnits="MM" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" fitInPolygonOnly="0" centroidWhole="0" placement="2" placementFlags="15" xOffset="0" centroidInside="0" rotationAngle="0" geometryGenerator="" geometryGeneratorType="PointGeometry" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                    <rendering displayAll="0" scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                    <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"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                            <Option type="int" name="type" value="2"/>
+                            <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>
                           <Option type="Map" name="PositionY">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                            <Option type="int" name="type" value="2"/>
+                            <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>
                         </Option>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -11353,8 +11346,8 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property key="dualview/previewExpressions" value="id"/>
-              <property key="embeddedWidgets/count" value="0"/>
+              <property value="id" key="dualview/previewExpressions"/>
+              <property value="0" key="embeddedWidgets/count"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
@@ -11362,17 +11355,17 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory sizeType="MM" opacity="1" diagramOrientation="Up" backgroundAlpha="255" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" lineSizeType="MM" enabled="0" penAlpha="255" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" rotationOffset="270" minimumSize="0" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" barWidth="5" penWidth="0">
+              <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">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute field="" color="#000000" label=""/>
+                <attribute label="" field="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" dist="0" placement="2">
+            <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" obstacle="0" priority="0">
               <properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
@@ -11460,81 +11453,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" name="" index="0"/>
-              <alias field="group" name="" index="1"/>
-              <alias field="comment" name="" index="2"/>
-              <alias field="moveable" name="" index="3"/>
-              <alias field="type" name="" index="4"/>
-              <alias field="name" name="" index="5"/>
-              <alias field="hidden" name="" index="6"/>
-              <alias field="auxiliary_storage_labeling_positiony" name="" index="7"/>
-              <alias field="auxiliary_storage_labeling_positionx" name="" index="8"/>
-              <alias field="fence_len" name="" index="9"/>
-              <alias field="cone_len" name="" index="10"/>
+              <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"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default expression="" field="id" applyOnUpdate="0"/>
-              <default expression="" field="group" applyOnUpdate="0"/>
-              <default expression="" field="comment" applyOnUpdate="0"/>
-              <default expression="" field="moveable" applyOnUpdate="0"/>
-              <default expression="" field="type" applyOnUpdate="0"/>
-              <default expression="" field="name" applyOnUpdate="0"/>
-              <default expression="" field="hidden" applyOnUpdate="0"/>
-              <default expression="" field="auxiliary_storage_labeling_positiony" applyOnUpdate="0"/>
-              <default expression="" field="auxiliary_storage_labeling_positionx" applyOnUpdate="0"/>
-              <default expression="" field="fence_len" applyOnUpdate="0"/>
-              <default expression="" field="cone_len" applyOnUpdate="0"/>
+              <default applyOnUpdate="0" expression="" field="id"/>
+              <default applyOnUpdate="0" expression="" field="group"/>
+              <default applyOnUpdate="0" expression="" field="comment"/>
+              <default applyOnUpdate="0" expression="" field="moveable"/>
+              <default applyOnUpdate="0" expression="" field="type"/>
+              <default applyOnUpdate="0" expression="" field="name"/>
+              <default applyOnUpdate="0" expression="" field="hidden"/>
+              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
+              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
+              <default applyOnUpdate="0" expression="" field="fence_len"/>
+              <default applyOnUpdate="0" expression="" field="cone_len"/>
             </defaults>
             <constraints>
-              <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="group" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="comment" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="moveable" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="hidden" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positiony" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positionx" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="fence_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="cone_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <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"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="id" desc="" exp=""/>
-              <constraint field="group" desc="" exp=""/>
-              <constraint field="comment" desc="" exp=""/>
-              <constraint field="moveable" desc="" exp=""/>
-              <constraint field="type" desc="" exp=""/>
-              <constraint field="name" desc="" exp=""/>
-              <constraint field="hidden" desc="" exp=""/>
-              <constraint field="auxiliary_storage_labeling_positiony" desc="" exp=""/>
-              <constraint field="auxiliary_storage_labeling_positionx" desc="" exp=""/>
-              <constraint field="fence_len" desc="" exp=""/>
-              <constraint field="cone_len" desc="" exp=""/>
+              <constraint exp="" desc="" field="id"/>
+              <constraint exp="" desc="" field="group"/>
+              <constraint exp="" desc="" field="comment"/>
+              <constraint exp="" desc="" field="moveable"/>
+              <constraint exp="" desc="" field="type"/>
+              <constraint exp="" desc="" field="name"/>
+              <constraint exp="" desc="" field="hidden"/>
+              <constraint exp="" desc="" field="auxiliary_storage_labeling_positiony"/>
+              <constraint exp="" desc="" field="auxiliary_storage_labeling_positionx"/>
+              <constraint exp="" desc="" field="fence_len"/>
+              <constraint exp="" desc="" field="cone_len"/>
             </constraintExpressions>
             <expressionfields>
-              <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
-              <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
-              <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="cone_len" subType="0" typeName="double precision"/>
+              <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=""/>
             </expressionfields>
             <attributeactions>
-              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
+            <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
               <columns>
-                <column type="field" name="id" width="-1" hidden="0"/>
-                <column type="field" name="group" width="-1" hidden="0"/>
-                <column type="actions" width="-1" hidden="1"/>
-                <column type="field" name="comment" width="223" hidden="0"/>
-                <column type="field" name="moveable" width="-1" hidden="0"/>
-                <column type="field" name="type" width="-1" hidden="0"/>
-                <column type="field" name="name" width="414" hidden="0"/>
-                <column type="field" name="hidden" width="-1" hidden="0"/>
-                <column type="field" name="fence_len" width="-1" hidden="0"/>
-                <column type="field" name="cone_len" width="-1" hidden="0"/>
-                <column type="field" name="auxiliary_storage_labeling_positiony" width="-1" hidden="1"/>
-                <column type="field" name="auxiliary_storage_labeling_positionx" width="-1" hidden="1"/>
+                <column width="-1" type="field" name="id" hidden="0"/>
+                <column width="-1" type="field" name="group" hidden="0"/>
+                <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"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -11579,18 +11572,18 @@ def my_form_open(dialog, layer, feature):
               <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-              <field labelOnTop="0" name="comment"/>
-              <field labelOnTop="0" name="cone_len"/>
-              <field labelOnTop="0" name="fence_len"/>
-              <field labelOnTop="0" name="group"/>
-              <field labelOnTop="0" name="hidden"/>
-              <field labelOnTop="0" name="id"/>
-              <field labelOnTop="0" name="length"/>
-              <field labelOnTop="0" name="moveable"/>
-              <field labelOnTop="0" name="name"/>
-              <field labelOnTop="0" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+              <field name="comment" labelOnTop="0"/>
+              <field name="cone_len" labelOnTop="0"/>
+              <field name="fence_len" labelOnTop="0"/>
+              <field name="group" labelOnTop="0"/>
+              <field name="hidden" labelOnTop="0"/>
+              <field name="id" labelOnTop="0"/>
+              <field name="length" labelOnTop="0"/>
+              <field name="moveable" labelOnTop="0"/>
+              <field name="name" labelOnTop="0"/>
+              <field name="type" labelOnTop="0"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -11607,58 +11600,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="133,182,111,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -11689,36 +11682,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -11733,44 +11726,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11793,64 +11786,64 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="1" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" referencescale="-1" enableorderby="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
-            <rule symbol="0" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone')" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-            <rule symbol="1" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-            <rule symbol="2" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-            <rule symbol="3" label="Construction" checkstate="0" filter="regexp_match(&quot;type&quot;, '^constr')" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+          <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>
-          <rule symbol="4" label="Is Visible" checkstate="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+          <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="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="round"/>
-                <Option type="QString" name="customdash" value="1;4"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="Point"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="dot"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -11881,56 +11874,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="round"/>
-                <Option type="QString" name="customdash" value="4;3"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="dash"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -11961,56 +11954,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.8"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12041,56 +12034,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.8"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12121,56 +12114,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12201,50 +12194,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="5" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="5" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="213,180,60,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12275,9 +12268,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12288,32 +12281,32 @@ def my_form_open(dialog, layer, feature):
         <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="comment" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="11" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.80000000000000004" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="0.59999999999999998" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="1" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="255,255,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.6"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12328,110 +12321,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                        <Option type="int" name="type" value="2"/>
+                        <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>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                        <Option type="int" name="type" value="2"/>
+                        <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>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="5" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="5" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1.8200000000000001" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                      <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>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </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}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="round( $length, 1) || 'm'" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="11" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12446,88 +12439,88 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="1"/>
-                        <Option type="int" name="type" value="3"/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                        <Option type="int" name="type" value="2"/>
+                        <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>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                        <Option type="int" name="type" value="2"/>
+                        <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>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="6" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="1"/>
-                      <Option type="int" name="type" value="3"/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                      <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>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
@@ -12536,11 +12529,11 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -12549,47 +12542,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -12620,9 +12613,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12630,12 +12623,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -12643,66 +12636,66 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="group" configurationFlags="None">
+        <field configurationFlags="None" name="group">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="comment" configurationFlags="None">
+        <field configurationFlags="None" name="comment">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="moveable" configurationFlags="None">
+        <field configurationFlags="None" name="moveable">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="hidden" configurationFlags="None">
+        <field configurationFlags="None" name="hidden">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="fence_len" configurationFlags="None">
+        <field configurationFlags="None" name="fence_len">
           <editWidget type="Hidden">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="cone_len" configurationFlags="None">
+        <field configurationFlags="None" name="cone_len">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -12711,69 +12704,69 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="group" name="" index="1"/>
-        <alias field="comment" name="" index="2"/>
-        <alias field="moveable" name="" index="3"/>
-        <alias field="type" name="" index="4"/>
-        <alias field="name" name="" index="5"/>
-        <alias field="hidden" name="" index="6"/>
-        <alias field="fence_len" name="" index="7"/>
-        <alias field="cone_len" name="" index="8"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="moveable" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="hidden" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="comment"/>
+        <default applyOnUpdate="0" expression="" field="moveable"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="hidden"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="group" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="comment" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="moveable" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="hidden" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="fence_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="cone_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="group" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="moveable" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="hidden" desc="" exp=""/>
-        <constraint field="fence_len" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
+        <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"/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="cone_len" subType="0" typeName="double precision"/>
+        <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=""/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="group" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="comment" width="373" hidden="0"/>
-          <column type="field" name="moveable" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="name" width="692" hidden="0"/>
-          <column type="field" name="hidden" width="-1" hidden="0"/>
-          <column type="field" name="fence_len" width="-1" hidden="0"/>
-          <column type="field" name="cone_len" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="group" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12819,18 +12812,18 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="comment"/>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="hidden"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length"/>
-        <field labelOnTop="0" name="moveable"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="comment" labelOnTop="0"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="hidden" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length" labelOnTop="0"/>
+        <field name="moveable" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -12838,7 +12831,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -12911,58 +12904,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="164,113,88,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12993,36 +12986,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -13037,44 +13030,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13097,54 +13090,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,178,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13175,9 +13168,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13188,11 +13181,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="&quot;id&quot;"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -13201,47 +13194,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13272,9 +13265,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13282,12 +13275,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -13295,10 +13288,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -13307,25 +13300,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
+        <alias index="0" name="" field="id"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13360,7 +13353,7 @@ def my_form_open(dialog, layer, feature):
         <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13368,7 +13361,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -13441,58 +13434,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="213,180,60,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13523,36 +13516,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="213,180,60,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="152,129,43,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="213,180,60,255"/>
@@ -13567,44 +13560,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="213,180,60,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="152,129,43,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13627,38 +13620,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="26,0,201,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="dot"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="b_diagonal"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="26,0,201,255"/>
@@ -13673,9 +13666,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13686,20 +13679,20 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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="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 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 value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -13708,47 +13701,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13779,9 +13772,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13789,18 +13782,18 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" name="active" value="true"/>
-                <Option type="QString" name="field" value="id"/>
-                <Option type="int" name="type" value="2"/>
+                <Option value="true" type="bool" name="active"/>
+                <Option value="id" type="QString" name="field"/>
+                <Option value="2" type="int" name="type"/>
               </Option>
             </Option>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -13808,40 +13801,40 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="page" configurationFlags="None">
+        <field configurationFlags="None" name="page">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
@@ -13850,40 +13843,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="page" name="" index="2"/>
-        <alias field="day" name="" index="3"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="page"/>
+        <alias index="3" name="" field="day"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="page" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="page" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="page" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="page"/>
+        <constraint exp="" desc="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;page&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;page&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="day" width="-1" hidden="0"/>
-          <column type="field" name="page" width="-1" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13920,9 +13913,9 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="page"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="page" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13930,7 +13923,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -13995,7 +13988,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -14006,7 +13999,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join cascadedDelete="0" joinFieldName="position" memoryCache="0" editable="0" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" upsertOnEdit="0" customPrefix="csv_" hasCustomPrefix="1">
+        <join targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" cascadedDelete="0" memoryCache="0" dynamicForm="0" editable="0" hasCustomPrefix="1" upsertOnEdit="0" customPrefix="csv_">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="club"/>
@@ -14033,58 +14026,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="id" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="id" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="114,155,111,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14115,36 +14108,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="81,111,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -14159,44 +14152,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="81,111,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14219,51 +14212,51 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" label="Show by day in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-          <rule symbol="1" label="Always show in marshal plan" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule symbol="2" label="Show in marshal maps" checkstate="0" 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" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <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}"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="0.8" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="0.8" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="1" enabled="1" locked="0">
+            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="Pixel"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14286,42 +14279,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="0.8" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="1" clip_to_extent="1" alpha="0.8" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="1" enabled="1" locked="0">
+            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="Pixel"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14344,42 +14337,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="0.01" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="2" clip_to_extent="1" alpha="0.01" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="1" enabled="1" locked="0">
+            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="0.1"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14402,9 +14395,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14415,40 +14408,40 @@ def my_form_open(dialog, layer, feature):
         <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}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.10000000000000001" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="231,113,72,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <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>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -14471,34 +14464,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14513,118 +14506,118 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="2" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </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}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.10000000000000001" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="231,113,72,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <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>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -14647,34 +14640,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14689,110 +14682,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="2" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </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}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.5" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14807,181 +14800,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="FontOpacity">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="ZIndex">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="8" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="5" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </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}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.59999999999999998" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14996,181 +14989,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="FontOpacity">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="8" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="5" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </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}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="8" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,0,255" shapeOpacity="0.90000000000000002" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,0,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,0,255"/>
@@ -15185,149 +15178,149 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="FontOpacity">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="0" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="10" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
@@ -15336,153 +15329,153 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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="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 type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="labeling/addDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/angleOffset" value="0"/>
-          <Option type="QString" name="labeling/blendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferBlendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferColorA" value="255"/>
-          <Option type="QString" name="labeling/bufferColorB" value="255"/>
-          <Option type="QString" name="labeling/bufferColorG" value="255"/>
-          <Option type="QString" name="labeling/bufferColorR" value="255"/>
-          <Option type="QString" name="labeling/bufferDraw" value="false"/>
-          <Option type="QString" name="labeling/bufferJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/bufferNoFill" value="false"/>
-          <Option type="QString" name="labeling/bufferSize" value="1"/>
-          <Option type="QString" name="labeling/bufferSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/bufferTransp" value="0"/>
-          <Option type="QString" name="labeling/centroidInside" value="false"/>
-          <Option type="QString" name="labeling/centroidWhole" value="false"/>
-          <Option type="QString" name="labeling/decimals" value="3"/>
-          <Option type="QString" name="labeling/displayAll" value="false"/>
-          <Option type="QString" name="labeling/dist" value="0"/>
-          <Option type="QString" name="labeling/distInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/drawLabels" value="false"/>
-          <Option type="QString" name="labeling/enabled" value="false"/>
-          <Option type="QString" name="labeling/fieldName" value="position"/>
-          <Option type="QString" name="labeling/fitInPolygonOnly" value="false"/>
-          <Option type="QString" name="labeling/fontCapitals" value="0"/>
-          <Option type="QString" name="labeling/fontFamily" value="Myriad Pro"/>
-          <Option type="QString" name="labeling/fontItalic" value="false"/>
-          <Option type="QString" name="labeling/fontLetterSpacing" value="0"/>
-          <Option type="QString" name="labeling/fontLimitPixelSize" value="false"/>
-          <Option type="QString" name="labeling/fontMaxPixelSize" value="10000"/>
-          <Option type="QString" name="labeling/fontMinPixelSize" value="3"/>
-          <Option type="QString" name="labeling/fontSize" value="10"/>
-          <Option type="QString" name="labeling/fontSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/fontStrikeout" value="false"/>
-          <Option type="QString" name="labeling/fontUnderline" value="false"/>
-          <Option type="QString" name="labeling/fontWeight" value="63"/>
-          <Option type="QString" name="labeling/fontWordSpacing" value="0"/>
-          <Option type="QString" name="labeling/formatNumbers" value="false"/>
-          <Option type="QString" name="labeling/isExpression" value="false"/>
-          <Option type="QString" name="labeling/labelOffsetInMapUnits" value="true"/>
-          <Option type="QString" name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/labelPerPart" value="false"/>
-          <Option type="QString" name="labeling/leftDirectionSymbol" value="&lt;"/>
-          <Option type="QString" name="labeling/limitNumLabels" value="false"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleIn" value="20"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleOut" value="-20"/>
-          <Option type="QString" name="labeling/maxNumLabels" value="2000"/>
-          <Option type="QString" name="labeling/mergeLines" value="false"/>
-          <Option type="QString" name="labeling/minFeatureSize" value="0"/>
-          <Option type="QString" name="labeling/multilineAlign" value="0"/>
-          <Option type="QString" name="labeling/multilineHeight" value="1"/>
-          <Option type="QString" name="labeling/namedStyle" value="Semibold"/>
-          <Option type="QString" name="labeling/obstacle" value="true"/>
-          <Option type="QString" name="labeling/obstacleFactor" value="1"/>
-          <Option type="QString" name="labeling/obstacleType" value="0"/>
-          <Option type="QString" name="labeling/offsetType" value="0"/>
-          <Option type="QString" name="labeling/placeDirectionSymbol" value="0"/>
-          <Option type="QString" name="labeling/placement" value="0"/>
-          <Option type="QString" name="labeling/placementFlags" value="10"/>
-          <Option type="QString" name="labeling/plussign" value="false"/>
-          <Option type="QString" name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option type="QString" name="labeling/preserveRotation" value="true"/>
-          <Option type="QString" name="labeling/previewBkgrdColor" value="#ffffff"/>
-          <Option type="QString" name="labeling/priority" value="5"/>
-          <Option type="QString" name="labeling/quadOffset" value="4"/>
-          <Option type="QString" name="labeling/repeatDistance" value="0"/>
-          <Option type="QString" name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/repeatDistanceUnit" value="1"/>
-          <Option type="QString" name="labeling/reverseDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/rightDirectionSymbol" value=">"/>
-          <Option type="QString" name="labeling/scaleMax" value="10000000"/>
-          <Option type="QString" name="labeling/scaleMin" value="1"/>
-          <Option type="QString" name="labeling/scaleVisibility" value="false"/>
-          <Option type="QString" name="labeling/shadowBlendMode" value="6"/>
-          <Option type="QString" name="labeling/shadowColorB" value="0"/>
-          <Option type="QString" name="labeling/shadowColorG" value="0"/>
-          <Option type="QString" name="labeling/shadowColorR" value="0"/>
-          <Option type="QString" name="labeling/shadowDraw" value="false"/>
-          <Option type="QString" name="labeling/shadowOffsetAngle" value="135"/>
-          <Option type="QString" name="labeling/shadowOffsetDist" value="1"/>
-          <Option type="QString" name="labeling/shadowOffsetGlobal" value="true"/>
-          <Option type="QString" name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowRadius" value="1.5"/>
-          <Option type="QString" name="labeling/shadowRadiusAlphaOnly" value="false"/>
-          <Option type="QString" name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowRadiusUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowScale" value="100"/>
-          <Option type="QString" name="labeling/shadowTransparency" value="30"/>
-          <Option type="QString" name="labeling/shadowUnder" value="0"/>
-          <Option type="QString" name="labeling/shapeBlendMode" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeBorderColorB" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorG" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorR" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderWidth" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeDraw" value="true"/>
-          <Option type="QString" name="labeling/shapeFillColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeFillColorB" value="138"/>
-          <Option type="QString" name="labeling/shapeFillColorG" value="0"/>
-          <Option type="QString" name="labeling/shapeFillColorR" value="101"/>
-          <Option type="QString" name="labeling/shapeJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeOffsetX" value="0"/>
-          <Option type="QString" name="labeling/shapeOffsetY" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeRadiiUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeRadiiX" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiY" value="0"/>
-          <Option type="QString" name="labeling/shapeRotation" value="0"/>
-          <Option type="QString" name="labeling/shapeRotationType" value="0"/>
-          <Option type="QString" name="labeling/shapeSVGFile" value=""/>
-          <Option type="QString" name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeSizeType" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeSizeX" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeY" value="0"/>
-          <Option type="QString" name="labeling/shapeTransparency" value="0"/>
-          <Option type="QString" name="labeling/shapeType" value="0"/>
-          <Option type="QString" name="labeling/textColorA" value="255"/>
-          <Option type="QString" name="labeling/textColorB" value="255"/>
-          <Option type="QString" name="labeling/textColorG" value="255"/>
-          <Option type="QString" name="labeling/textColorR" value="255"/>
-          <Option type="QString" name="labeling/textTransp" value="0"/>
-          <Option type="QString" name="labeling/upsidedownLabels" value="0"/>
-          <Option type="QString" name="labeling/wrapChar" value=""/>
-          <Option type="QString" name="labeling/xOffset" value="0"/>
-          <Option type="QString" name="labeling/yOffset" value="0"/>
-          <Option type="QString" name="labeling/zIndex" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -15491,47 +15484,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -15562,9 +15555,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15572,12 +15565,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -15585,119 +15578,119 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" name="IsMultiline" value="false"/>
-                <Option type="bool" name="UseHtml" value="false"/>
+                <Option value="false" type="bool" name="IsMultiline"/>
+                <Option value="false" type="bool" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" name="IsMultiline" value="false"/>
-                <Option type="bool" name="UseHtml" value="false"/>
+                <Option value="false" type="bool" name="IsMultiline"/>
+                <Option value="false" type="bool" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="notes" configurationFlags="None">
+        <field configurationFlags="None" name="notes">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="xyposition" configurationFlags="None">
+        <field configurationFlags="None" name="xyposition">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_position" configurationFlags="None">
+        <field configurationFlags="None" name="csv_position">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_club" configurationFlags="None">
+        <field configurationFlags="None" name="csv_club">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="csv_firstname" configurationFlags="None">
+        <field configurationFlags="None" name="csv_firstname">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_surname" configurationFlags="None">
+        <field configurationFlags="None" name="csv_surname">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_days" configurationFlags="None">
+        <field configurationFlags="None" name="csv_days">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_first_runner" configurationFlags="None">
+        <field configurationFlags="None" name="csv_first_runner">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_last_runner" configurationFlags="None">
+        <field configurationFlags="None" name="csv_last_runner">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_instructions" configurationFlags="None">
+        <field configurationFlags="None" name="csv_instructions">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -15706,90 +15699,90 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="position" name="" index="1"/>
-        <alias field="type" name="" index="2"/>
-        <alias field="notes" name="" index="3"/>
-        <alias field="xyposition" name="" index="4"/>
-        <alias field="day" name="" index="5"/>
-        <alias field="csv_position" name="" index="6"/>
-        <alias field="csv_club" name="" index="7"/>
-        <alias field="csv_firstname" name="" index="8"/>
-        <alias field="csv_surname" name="" index="9"/>
-        <alias field="csv_days" name="" index="10"/>
-        <alias field="csv_first_runner" name="" index="11"/>
-        <alias field="csv_last_runner" name="" index="12"/>
-        <alias field="csv_instructions" name="" index="13"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="notes" applyOnUpdate="0"/>
-        <default expression="" field="xyposition" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="csv_position" applyOnUpdate="0"/>
-        <default expression="" field="csv_club" applyOnUpdate="0"/>
-        <default expression="" field="csv_firstname" applyOnUpdate="0"/>
-        <default expression="" field="csv_surname" applyOnUpdate="0"/>
-        <default expression="" field="csv_days" applyOnUpdate="0"/>
-        <default expression="" field="csv_first_runner" applyOnUpdate="0"/>
-        <default expression="" field="csv_last_runner" applyOnUpdate="0"/>
-        <default expression="" field="csv_instructions" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="notes"/>
+        <default applyOnUpdate="0" expression="" field="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"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="notes" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="xyposition" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_club" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_firstname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_surname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_days" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_first_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_last_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_instructions" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="notes" desc="" exp=""/>
-        <constraint field="xyposition" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="csv_position" desc="" exp=""/>
-        <constraint field="csv_club" desc="" exp=""/>
-        <constraint field="csv_firstname" desc="" exp=""/>
-        <constraint field="csv_surname" desc="" exp=""/>
-        <constraint field="csv_days" desc="" exp=""/>
-        <constraint field="csv_first_runner" desc="" exp=""/>
-        <constraint field="csv_last_runner" desc="" exp=""/>
-        <constraint field="csv_instructions" desc="" exp=""/>
+        <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"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="position" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="notes" width="-1" hidden="0"/>
-          <column type="field" name="xyposition" width="-1" hidden="0"/>
-          <column type="field" name="csv_club" width="-1" hidden="0"/>
-          <column type="field" name="csv_first_runner" width="-1" hidden="0"/>
-          <column type="field" name="csv_last_runner" width="-1" hidden="0"/>
-          <column type="field" name="csv_firstname" width="-1" hidden="0"/>
-          <column type="field" name="csv_surname" width="-1" hidden="0"/>
-          <column type="field" name="csv_position" width="-1" hidden="0"/>
-          <column type="field" name="csv_days" width="-1" hidden="0"/>
-          <column type="field" name="day" width="-1" hidden="0"/>
-          <column type="field" name="csv_instructions" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15857,40 +15850,40 @@ def my_form_open(dialog, layer, feature):
         <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="csv_captain" reuseLastValue="0"/>
@@ -15963,7 +15956,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" minScale="1e+08" autoRefreshEnabled="0" wkbType="NoGeometry" maxScale="100000" refreshOnNotifyMessage="">
+    <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="">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -16016,7 +16009,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -16029,8 +16022,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="all_routes20170907054841602"/>
         <layer id="marshal_positions20160930121322287"/>
+        <layer id="all_routes20170907054841602"/>
       </dataDependencies>
       <expressionfields/>
       <map-layer-style-manager current="default">
@@ -16044,58 +16037,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="243,166,178,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16126,36 +16119,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="243,166,178,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="174,119,127,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="243,166,178,255"/>
@@ -16170,44 +16163,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="243,166,178,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="174,119,127,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16230,9 +16223,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16241,11 +16234,11 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="first_name"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -16254,129 +16247,129 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="club" configurationFlags="None">
+        <field configurationFlags="None" name="club">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="firstname" configurationFlags="None">
+        <field configurationFlags="None" name="firstname">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="surname" configurationFlags="None">
+        <field configurationFlags="None" name="surname">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="phone" configurationFlags="None">
+        <field configurationFlags="None" name="phone">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="email" configurationFlags="None">
+        <field configurationFlags="None" name="email">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="captain" configurationFlags="None">
+        <field configurationFlags="None" name="captain">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="captain_phone" configurationFlags="None">
+        <field configurationFlags="None" name="captain_phone">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="captain_email" configurationFlags="None">
+        <field configurationFlags="None" name="captain_email">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="days" configurationFlags="None">
+        <field configurationFlags="None" name="days">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="races" configurationFlags="None">
+        <field configurationFlags="None" name="races">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="first_runner" configurationFlags="None">
+        <field configurationFlags="None" name="first_runner">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="last_runner" configurationFlags="None">
+        <field configurationFlags="None" name="last_runner">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="instructions" configurationFlags="None">
+        <field configurationFlags="None" name="instructions">
           <editWidget type="">
             <config>
               <Option/>
@@ -16385,94 +16378,94 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="position" name="" index="0"/>
-        <alias field="club" name="" index="1"/>
-        <alias field="firstname" name="" index="2"/>
-        <alias field="surname" name="" index="3"/>
-        <alias field="name" name="" index="4"/>
-        <alias field="phone" name="" index="5"/>
-        <alias field="email" name="" index="6"/>
-        <alias field="captain" name="" index="7"/>
-        <alias field="captain_phone" name="" index="8"/>
-        <alias field="captain_email" name="" index="9"/>
-        <alias field="days" name="" index="10"/>
-        <alias field="races" name="" index="11"/>
-        <alias field="first_runner" name="" index="12"/>
-        <alias field="last_runner" name="" index="13"/>
-        <alias field="instructions" name="" index="14"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="club" applyOnUpdate="0"/>
-        <default expression="" field="firstname" applyOnUpdate="0"/>
-        <default expression="" field="surname" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="phone" applyOnUpdate="0"/>
-        <default expression="" field="email" applyOnUpdate="0"/>
-        <default expression="" field="captain" applyOnUpdate="0"/>
-        <default expression="" field="captain_phone" applyOnUpdate="0"/>
-        <default expression="" field="captain_email" applyOnUpdate="0"/>
-        <default expression="" field="days" applyOnUpdate="0"/>
-        <default expression="" field="races" applyOnUpdate="0"/>
-        <default expression="" field="first_runner" applyOnUpdate="0"/>
-        <default expression="" field="last_runner" applyOnUpdate="0"/>
-        <default expression="" field="instructions" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="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"/>
       </defaults>
       <constraints>
-        <constraint field="position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="club" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="firstname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="surname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="phone" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="email" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="captain" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="captain_phone" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="captain_email" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="days" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="races" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="first_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="last_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="instructions" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="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="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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="club" desc="" exp=""/>
-        <constraint field="firstname" desc="" exp=""/>
-        <constraint field="surname" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="phone" desc="" exp=""/>
-        <constraint field="email" desc="" exp=""/>
-        <constraint field="captain" desc="" exp=""/>
-        <constraint field="captain_phone" desc="" exp=""/>
-        <constraint field="captain_email" desc="" exp=""/>
-        <constraint field="days" desc="" exp=""/>
-        <constraint field="races" desc="" exp=""/>
-        <constraint field="first_runner" desc="" exp=""/>
-        <constraint field="last_runner" desc="" exp=""/>
-        <constraint field="instructions" desc="" exp=""/>
+        <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"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="position" width="-1" hidden="0"/>
-          <column type="field" name="name" width="221" hidden="0"/>
-          <column type="field" name="club" width="-1" hidden="0"/>
-          <column type="field" name="phone" width="-1" hidden="0"/>
-          <column type="field" name="email" width="-1" hidden="0"/>
-          <column type="field" name="captain" width="-1" hidden="0"/>
-          <column type="field" name="races" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="first_runner" width="-1" hidden="0"/>
-          <column type="field" name="last_runner" width="-1" hidden="0"/>
-          <column type="field" name="instructions" width="-1" hidden="0"/>
-          <column type="field" name="firstname" width="-1" hidden="0"/>
-          <column type="field" name="surname" width="-1" hidden="0"/>
-          <column type="field" name="captain_phone" width="-1" hidden="0"/>
-          <column type="field" name="captain_email" width="-1" hidden="0"/>
+          <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="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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16523,23 +16516,23 @@ def my_form_open(dialog, layer, feature):
         <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16547,7 +16540,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -16612,7 +16605,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -16637,58 +16630,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="141,90,153,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16719,36 +16712,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="141,90,153,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="101,64,109,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="141,90,153,255"/>
@@ -16763,44 +16756,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="141,90,153,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="101,64,109,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16823,58 +16816,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="123,211,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16905,50 +16898,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="4;1;1;1"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1.25"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -16979,30 +16972,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -17022,33 +17015,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -17064,32 +17057,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@1@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -17104,9 +17097,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -17119,11 +17112,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -17132,47 +17125,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -17203,9 +17196,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17213,12 +17206,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -17226,17 +17219,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -17245,30 +17238,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17304,8 +17297,8 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17313,7 +17306,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -17378,7 +17371,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -17403,58 +17396,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="232,113,141,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17485,36 +17478,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="232,113,141,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="166,81,101,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="232,113,141,255"/>
@@ -17529,44 +17522,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="232,113,141,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="166,81,101,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -17589,44 +17582,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
+      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="name" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="8.5" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.75" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSize="1.5" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -17641,109 +17634,109 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="LabelRotation">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                    <Option type="int" name="type" value="3"/>
+                    <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>
                   <Option type="Map" name="PositionX">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="field" value="label_x"/>
-                    <Option type="int" name="type" value="2"/>
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="label_x" type="QString" name="field"/>
+                    <Option value="2" type="int" name="type"/>
                   </Option>
                   <Option type="Map" name="PositionY">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="field" value="label_y"/>
-                    <Option type="int" name="type" value="2"/>
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="label_y" type="QString" name="field"/>
+                    <Option value="2" type="int" name="type"/>
                   </Option>
                   <Option type="Map" name="Size">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                    <Option type="int" name="type" value="3"/>
+                    <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>
                 </Option>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="1" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="0.20000000000000001" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="PositionX">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_x"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_x" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_y"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_y" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <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>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="&quot;name&quot;"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -17752,47 +17745,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -17823,9 +17816,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17833,12 +17826,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -17846,160 +17839,160 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="osm_id" configurationFlags="None">
+        <field configurationFlags="None" name="osm_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="z_order" configurationFlags="None">
+        <field configurationFlags="None" name="z_order">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="population" configurationFlags="None">
+        <field configurationFlags="None" name="population">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_x" configurationFlags="None">
+        <field configurationFlags="None" name="label_x">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_y" configurationFlags="None">
+        <field configurationFlags="None" name="label_y">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_rota" configurationFlags="None">
+        <field configurationFlags="None" name="label_rota">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="osm_id" name="" index="1"/>
-        <alias field="name" name="" index="2"/>
-        <alias field="type" name="" index="3"/>
-        <alias field="z_order" name="" index="4"/>
-        <alias field="population" name="" index="5"/>
-        <alias field="label_x" name="" index="6"/>
-        <alias field="label_y" name="" index="7"/>
-        <alias field="label_rota" name="" index="8"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="osm_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="z_order" applyOnUpdate="0"/>
-        <default expression="" field="population" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rota" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="osm_id"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="z_order"/>
+        <default applyOnUpdate="0" expression="" field="population"/>
+        <default applyOnUpdate="0" expression="" field="label_x"/>
+        <default applyOnUpdate="0" expression="" field="label_y"/>
+        <default applyOnUpdate="0" expression="" field="label_rota"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="osm_id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="z_order" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="population" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label_x" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label_y" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label_rota" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="osm_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="z_order" desc="" exp=""/>
-        <constraint field="population" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rota" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="osm_id"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="z_order"/>
+        <constraint exp="" desc="" field="population"/>
+        <constraint exp="" desc="" field="label_x"/>
+        <constraint exp="" desc="" field="label_y"/>
+        <constraint exp="" desc="" field="label_rota"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="osm_id" width="-1" hidden="0"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="z_order" width="-1" hidden="0"/>
-          <column type="field" name="population" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="label_x" width="-1" hidden="0"/>
-          <column type="field" name="label_y" width="-1" hidden="0"/>
-          <column type="field" name="label_rota" width="-1" hidden="0"/>
+          <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="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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18042,15 +18035,15 @@ def my_form_open(dialog, layer, feature):
         <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -18058,7 +18051,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -18123,7 +18116,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -18148,58 +18141,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,158,23,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18230,36 +18223,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,158,23,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="182,113,16,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,158,23,255"/>
@@ -18274,44 +18267,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="255,158,23,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="182,113,16,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -18334,52 +18327,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
+      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="7" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.80000000000000004" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="196,60,57,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -18402,34 +18395,34 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -18444,116 +18437,116 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-          <placement repeatDistanceUnits="MapUnit" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="4" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="LineGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="3" priority="3" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="5" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="0.29999999999999999" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="AlwaysShow">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="always_sho"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="always_sho" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="IsObstacle">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="&quot;&quot;"/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="&quot;&quot;" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="LabelRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="PositionX">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_x"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_x" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_y"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_y" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="Priority">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
                 <Option type="Map" name="Show">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="auxiliary_storage_labeling_show"/>
-                  <Option type="int" name="type" value="2"/>
+                  <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>
                 <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <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>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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="List" name="dualview/previewExpressions">
-            <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 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>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -18562,47 +18555,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -18633,9 +18626,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18643,12 +18636,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -18656,124 +18649,124 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="osm_id" configurationFlags="None">
+        <field configurationFlags="None" name="osm_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="highway" configurationFlags="None">
+        <field configurationFlags="None" name="highway">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="waterway" configurationFlags="None">
+        <field configurationFlags="None" name="waterway">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="aerialway" configurationFlags="None">
+        <field configurationFlags="None" name="aerialway">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="barrier" configurationFlags="None">
+        <field configurationFlags="None" name="barrier">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="man_made" configurationFlags="None">
+        <field configurationFlags="None" name="man_made">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="z_order" configurationFlags="None">
+        <field configurationFlags="None" name="z_order">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="other_tags" configurationFlags="None">
+        <field configurationFlags="None" name="other_tags">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="never_show" configurationFlags="None">
+        <field configurationFlags="None" name="never_show">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label_x" configurationFlags="None">
+        <field configurationFlags="None" name="label_x">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label_y" configurationFlags="None">
+        <field configurationFlags="None" name="label_y">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label_rota" configurationFlags="None">
+        <field configurationFlags="None" name="label_rota">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="always_sho" configurationFlags="None">
+        <field configurationFlags="None" name="always_sho">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="resident_a" configurationFlags="None">
+        <field configurationFlags="None" name="resident_a">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="auxiliary_storage_labeling_show" configurationFlags="None">
+        <field configurationFlags="None" name="auxiliary_storage_labeling_show">
           <editWidget type="Hidden">
             <config>
               <Option/>
@@ -18782,100 +18775,100 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" name="" index="0"/>
-        <alias field="name" name="" index="1"/>
-        <alias field="highway" name="" index="2"/>
-        <alias field="waterway" name="" index="3"/>
-        <alias field="aerialway" name="" index="4"/>
-        <alias field="barrier" name="" index="5"/>
-        <alias field="man_made" name="" index="6"/>
-        <alias field="z_order" name="" index="7"/>
-        <alias field="other_tags" name="" index="8"/>
-        <alias field="never_show" name="" index="9"/>
-        <alias field="label_x" name="" index="10"/>
-        <alias field="label_y" name="" index="11"/>
-        <alias field="label_rota" name="" index="12"/>
-        <alias field="always_sho" name="" index="13"/>
-        <alias field="resident_a" name="" index="14"/>
-        <alias field="auxiliary_storage_labeling_show" name="" index="15"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="osm_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="highway" applyOnUpdate="0"/>
-        <default expression="" field="waterway" applyOnUpdate="0"/>
-        <default expression="" field="aerialway" applyOnUpdate="0"/>
-        <default expression="" field="barrier" applyOnUpdate="0"/>
-        <default expression="" field="man_made" applyOnUpdate="0"/>
-        <default expression="" field="z_order" applyOnUpdate="0"/>
-        <default expression="" field="other_tags" applyOnUpdate="0"/>
-        <default expression="" field="never_show" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rota" applyOnUpdate="0"/>
-        <default expression="" field="always_sho" applyOnUpdate="0"/>
-        <default expression="" field="resident_a" applyOnUpdate="0"/>
-        <default expression="" field="auxiliary_storage_labeling_show" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="osm_id"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="highway"/>
+        <default applyOnUpdate="0" expression="" field="waterway"/>
+        <default applyOnUpdate="0" expression="" field="aerialway"/>
+        <default applyOnUpdate="0" expression="" field="barrier"/>
+        <default applyOnUpdate="0" expression="" field="man_made"/>
+        <default applyOnUpdate="0" expression="" field="z_order"/>
+        <default applyOnUpdate="0" expression="" field="other_tags"/>
+        <default applyOnUpdate="0" expression="" field="never_show"/>
+        <default applyOnUpdate="0" expression="" field="label_x"/>
+        <default applyOnUpdate="0" expression="" field="label_y"/>
+        <default applyOnUpdate="0" expression="" field="label_rota"/>
+        <default applyOnUpdate="0" expression="" field="always_sho"/>
+        <default applyOnUpdate="0" expression="" field="resident_a"/>
+        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_show"/>
       </defaults>
       <constraints>
-        <constraint field="osm_id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="highway" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="waterway" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="aerialway" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="barrier" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="man_made" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="z_order" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="other_tags" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="never_show" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label_x" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label_y" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label_rota" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="always_sho" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="resident_a" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="auxiliary_storage_labeling_show" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="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="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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="osm_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="highway" desc="" exp=""/>
-        <constraint field="waterway" desc="" exp=""/>
-        <constraint field="aerialway" desc="" exp=""/>
-        <constraint field="barrier" desc="" exp=""/>
-        <constraint field="man_made" desc="" exp=""/>
-        <constraint field="z_order" desc="" exp=""/>
-        <constraint field="other_tags" desc="" exp=""/>
-        <constraint field="never_show" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rota" desc="" exp=""/>
-        <constraint field="always_sho" desc="" exp=""/>
-        <constraint field="resident_a" desc="" exp=""/>
-        <constraint field="auxiliary_storage_labeling_show" desc="" exp=""/>
+        <constraint exp="" desc="" field="osm_id"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="highway"/>
+        <constraint exp="" desc="" field="waterway"/>
+        <constraint exp="" desc="" field="aerialway"/>
+        <constraint exp="" desc="" field="barrier"/>
+        <constraint exp="" desc="" field="man_made"/>
+        <constraint exp="" desc="" field="z_order"/>
+        <constraint exp="" desc="" field="other_tags"/>
+        <constraint exp="" desc="" field="never_show"/>
+        <constraint exp="" desc="" field="label_x"/>
+        <constraint exp="" desc="" field="label_y"/>
+        <constraint exp="" desc="" field="label_rota"/>
+        <constraint exp="" desc="" field="always_sho"/>
+        <constraint exp="" desc="" field="resident_a"/>
+        <constraint exp="" desc="" field="auxiliary_storage_labeling_show"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;osm_id&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="osm_id" width="-1" hidden="0"/>
-          <column type="field" name="name" width="160" hidden="0"/>
-          <column type="field" name="z_order" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="highway" width="-1" hidden="0"/>
-          <column type="field" name="waterway" width="-1" hidden="0"/>
-          <column type="field" name="aerialway" width="-1" hidden="0"/>
-          <column type="field" name="barrier" width="-1" hidden="0"/>
-          <column type="field" name="man_made" width="-1" hidden="0"/>
-          <column type="field" name="other_tags" width="142" hidden="0"/>
-          <column type="field" name="never_show" width="-1" hidden="0"/>
-          <column type="field" name="label_x" width="-1" hidden="0"/>
-          <column type="field" name="label_y" width="-1" hidden="0"/>
-          <column type="field" name="label_rota" width="-1" hidden="0"/>
-          <column type="field" name="always_sho" width="-1" hidden="0"/>
-          <column type="field" name="resident_a" width="-1" hidden="0"/>
-          <column type="field" name="auxiliary_storage_labeling_show" width="-1" hidden="0"/>
+          <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="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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18943,40 +18936,40 @@ def my_form_open(dialog, layer, feature):
         <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="aerialway" reuseLastValue="0"/>
@@ -19044,7 +19037,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -19109,7 +19102,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -19134,58 +19127,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="231,113,72,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -19216,36 +19209,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="231,113,72,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="165,81,51,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="231,113,72,255"/>
@@ -19260,44 +19253,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="231,113,72,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="165,81,51,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -19320,54 +19313,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
+          <rule filter="&quot;type&quot; = 'toilets'" symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
+          <rule filter="&quot;type&quot; = 'togbag'" symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule filter=" &quot;type&quot; = 'closure'" symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule filter="&quot;type&quot; = 'myciti'" symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="name" value="star"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.5"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="7"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -19390,47 +19383,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '7' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="0,32,80,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="amenity/amenity_toilets.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <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 name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="7"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,32,80,255"/>
@@ -19452,47 +19445,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="../images/gym-bag.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <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 name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="6"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -19514,57 +19507,57 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="../images/road_closure.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <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 name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="6"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -19586,47 +19579,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '6' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="0,12,254,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="transport/transport_bus_stop.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="255,255,255,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <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 name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,12,254,255"/>
@@ -19649,18 +19642,18 @@ def my_form_open(dialog, layer, feature):
               <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="13"/>
-                    <Option type="QString" name="blur_level" value="2.645"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="offset_angle" value="135"/>
-                    <Option type="QString" name="offset_distance" value="2"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="opacity" value="1"/>
+                    <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>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -19677,24 +19670,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="0"/>
-                    <Option type="QString" name="blur_level" value="0.7935"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color1" value="0,0,255,255"/>
-                    <Option type="QString" name="color2" value="0,255,0,255"/>
-                    <Option type="QString" name="color_type" value="0"/>
-                    <Option type="QString" name="direction" value="ccw"/>
-                    <Option type="QString" name="discrete" value="0"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="1"/>
-                    <Option type="QString" name="opacity" value="0.5"/>
-                    <Option type="QString" name="rampType" value="gradient"/>
-                    <Option type="QString" name="single_color" value="255,255,255,255"/>
-                    <Option type="QString" name="spec" value="rgb"/>
-                    <Option type="QString" name="spread" value="2"/>
-                    <Option type="QString" name="spread_unit" value="MM"/>
-                    <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <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>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -19717,10 +19710,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="0"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="1"/>
-                    <Option type="QString" name="opacity" value="1"/>
+                    <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>
                   <prop k="blend_mode" v="0"/>
                   <prop k="draw_mode" v="2"/>
@@ -19729,18 +19722,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="13"/>
-                    <Option type="QString" name="blur_level" value="2.645"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="offset_angle" value="135"/>
-                    <Option type="QString" name="offset_distance" value="2"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="opacity" value="1"/>
+                    <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>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -19757,24 +19750,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="0"/>
-                    <Option type="QString" name="blur_level" value="0.7935"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color1" value="0,0,255,255"/>
-                    <Option type="QString" name="color2" value="0,255,0,255"/>
-                    <Option type="QString" name="color_type" value="0"/>
-                    <Option type="QString" name="direction" value="ccw"/>
-                    <Option type="QString" name="discrete" value="0"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="opacity" value="0.5"/>
-                    <Option type="QString" name="rampType" value="gradient"/>
-                    <Option type="QString" name="single_color" value="255,255,255,255"/>
-                    <Option type="QString" name="spec" value="rgb"/>
-                    <Option type="QString" name="spread" value="2"/>
-                    <Option type="QString" name="spread_unit" value="MM"/>
-                    <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <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>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -19798,47 +19791,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="5" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="5" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="43,153,41,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="transport/amenity=parking.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <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 name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="6"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="color" v="43,153,41,255"/>
@@ -19860,15 +19853,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19877,32 +19870,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="name" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferSize="2" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="2" shapeRadiiY="2" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="1" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="0.69999999999999996" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -19917,99 +19910,99 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="LabelDistance">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                    <Option type="int" name="type" value="3"/>
+                    <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>
                   <Option type="Map" name="OffsetQuad">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="2"/>
-                    <Option type="int" name="type" value="3"/>
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="2" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
                   <Option type="Map" name="Size">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                    <Option type="int" name="type" value="3"/>
+                    <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>
                 </Option>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="2" geometryGenerator="" lineAnchorType="0" xOffset="2" dist="3" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="3" offsetUnits="MM" placement="0" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="10" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelDistance">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="OffsetQuad">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="2"/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="2" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <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>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -20018,47 +20011,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -20089,9 +20082,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20099,12 +20092,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -20112,31 +20105,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -20145,40 +20138,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="name" name="" index="2"/>
-        <alias field="distance" name="" index="3"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="name"/>
+        <alias index="3" name="" field="distance"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="distance" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20216,10 +20209,10 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20227,7 +20220,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -20300,58 +20293,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="152,125,183,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -20382,36 +20375,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="152,125,183,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="109,89,131,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -20426,44 +20419,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="152,125,183,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="109,89,131,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -20486,42 +20479,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="LinePatternFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="LinePatternFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="135"/>
-                <Option type="QString" name="clip_mode" value="during_render"/>
-                <Option type="QString" name="color" value="211,134,33,255"/>
-                <Option type="QString" name="coordinate_reference" value="feature"/>
-                <Option type="QString" name="distance" value="2"/>
-                <Option type="QString" name="distance_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="distance_unit" value="MM"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <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>
               <prop k="angle" v="135"/>
               <prop k="clip_mode" v="during_render"/>
@@ -20540,48 +20533,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="line" alpha="1" name="@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="line" name="@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="align_dash_pattern" value="0"/>
-                    <Option type="QString" name="capstyle" value="square"/>
-                    <Option type="QString" name="customdash" value="5;2"/>
-                    <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="customdash_unit" value="MM"/>
-                    <Option type="QString" name="dash_pattern_offset" value="0"/>
-                    <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                    <Option type="QString" name="draw_inside_polygon" value="0"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="line_color" value="211,134,33,255"/>
-                    <Option type="QString" name="line_style" value="solid"/>
-                    <Option type="QString" name="line_width" value="0.3"/>
-                    <Option type="QString" name="line_width_unit" value="MM"/>
-                    <Option type="QString" name="offset" value="0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="ring_filter" value="0"/>
-                    <Option type="QString" name="trim_distance_end" value="0"/>
-                    <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                    <Option type="QString" name="trim_distance_start" value="0"/>
-                    <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                    <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                    <Option type="QString" name="use_custom_dash" value="0"/>
-                    <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <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>
                   <prop k="align_dash_pattern" v="0"/>
                   <prop k="capstyle" v="square"/>
@@ -20612,27 +20605,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 type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="211,134,33,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.46"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="no"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="211,134,33,255"/>
@@ -20647,9 +20640,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20660,11 +20653,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -20673,47 +20666,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -20744,9 +20737,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20754,12 +20747,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="1" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="1" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -20767,10 +20760,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="FID" configurationFlags="None">
+        <field configurationFlags="None" name="FID">
           <editWidget type="">
             <config>
               <Option/>
@@ -20779,26 +20772,26 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" name="" index="0"/>
+        <alias index="0" name="" field="FID"/>
       </aliases>
       <defaults>
-        <default expression="" field="FID" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="FID"/>
       </defaults>
       <constraints>
-        <constraint field="FID" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="FID" constraints="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" desc="" exp=""/>
+        <constraint exp="" desc="" field="FID"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="431" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="431" type="field" name="type" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20834,8 +20827,8 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20843,7 +20836,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -20908,7 +20901,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -20933,58 +20926,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="190,207,80,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21015,36 +21008,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="190,207,80,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,148,57,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,207,80,255"/>
@@ -21059,44 +21052,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="190,207,80,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,148,57,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -21119,61 +21112,61 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" label="Road Open" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
-          <rule symbol="1" label="No Parking" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
-          <rule symbol="2" label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
-          <rule symbol="3" label="One-Way" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
-          <rule symbol="4" label="Road Closures" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
+          <rule filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule filter="&quot;status&quot; = 'one-way'" symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,255,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21204,50 +21197,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="2"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -21267,40 +21260,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,255,0,255"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0.5"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="1"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -21323,52 +21316,52 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="2;1;1;1"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,255,0,255"/>
-                <Option type="QString" name="line_style" value="dash dot dot"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21399,41 +21392,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="25"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -21453,46 +21446,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@2@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,255,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="35,35,35,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3.5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -21515,58 +21508,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="3;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,255,0,255"/>
-                <Option type="QString" name="line_style" value="dash"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21597,41 +21590,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="25"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -21651,46 +21644,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@3@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,255,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="35,35,35,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3.5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -21713,58 +21706,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21795,20 +21788,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21817,32 +21810,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="times" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="9" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -21857,67 +21850,67 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <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>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -21926,47 +21919,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -21997,9 +21990,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22007,12 +22000,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -22020,31 +22013,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="status" configurationFlags="None">
+        <field configurationFlags="None" name="status">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="times" configurationFlags="None">
+        <field configurationFlags="None" name="times">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -22053,40 +22046,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="status" name="" index="2"/>
-        <alias field="times" name="" index="3"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="status"/>
+        <alias index="3" name="" field="times"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
-        <default expression="" field="times" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="status"/>
+        <default applyOnUpdate="0" expression="" field="times"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="status" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="times" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
-        <constraint field="times" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="status"/>
+        <constraint exp="" desc="" field="times"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="202" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="status" width="-1" hidden="0"/>
-          <column type="field" name="times" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="202" type="field" name="type" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22124,10 +22117,10 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="status"/>
-        <field labelOnTop="0" name="times"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="status" labelOnTop="0"/>
+        <field name="times" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -22135,20 +22128,20 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
-        <xmin>18.37571523317913247</xmin>
+        <xmin>18.37568241336308006</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
-        <ymax>-33.89978292253275782</ymax>
+        <ymax>-33.8998161888264562</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37571523317913247</xmin>
+        <xmin>18.37568241336308006</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
-        <ymax>-33.89978292253275782</ymax>
+        <ymax>-33.8998161888264562</ymax>
       </wgs84extent>
-      <id>route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1</id>
+      <id>route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6</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>
@@ -22208,58 +22201,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="225,89,137,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22290,36 +22283,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="161,64,98,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -22334,44 +22327,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="161,64,98,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22394,54 +22387,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
+      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="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}">
             <settings calloutType="simple">
-              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <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>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -22464,34 +22457,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -22506,138 +22499,138 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                             <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="quadrant" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="rotation" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </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}">
             <settings calloutType="simple">
-              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <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>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -22660,34 +22653,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -22702,98 +22695,98 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                             <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="quadrant" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="rotation" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
@@ -22801,32 +22794,32 @@ def my_form_open(dialog, layer, feature):
           <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}">
               <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <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">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <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">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="210,32,39,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="210,32,39,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <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>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="210,32,39,255"/>
@@ -22841,130 +22834,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <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"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="quadrant" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="rotation" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <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>
                 </callout>
               </settings>
             </rule>
             <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{7539ef8a-1068-4b69-a2cc-c8e9b0369bb7}">
               <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <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">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <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">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="103,34,144,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <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>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="103,34,144,255"/>
@@ -22979,130 +22972,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <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"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="quadrant" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="rotation" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <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>
                 </callout>
               </settings>
             </rule>
             <rule active="0" filter="&quot;Source&quot; = '5KM'" description="5KM" key="{8573f5c5-a6be-456b-8bc8-6817ef1a8c90}">
               <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <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">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <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">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="145,211,55,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="145,211,55,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <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>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="145,211,55,255"/>
@@ -23117,138 +23110,138 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <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"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="quadrant" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="rotation" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <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>
                 </callout>
               </settings>
             </rule>
             <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{a7469442-5b53-4ac3-b1ce-1af4427c496f}">
               <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <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">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <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">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                      <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                         <Option type="Map">
-                          <Option type="QString" name="angle" value="0"/>
-                          <Option type="QString" name="cap_style" value="square"/>
-                          <Option type="QString" name="color" value="133,182,111,255"/>
-                          <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                          <Option type="QString" name="joinstyle" value="bevel"/>
-                          <Option type="QString" name="name" value="circle"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="0"/>
-                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="scale_method" value="diameter"/>
-                          <Option type="QString" name="size" value="2"/>
-                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="size_unit" value="MM"/>
-                          <Option type="QString" name="vertical_anchor_point" value="1"/>
+                          <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>
                         <prop k="angle" v="0"/>
                         <prop k="cap_style" v="square"/>
@@ -23271,34 +23264,34 @@ def my_form_open(dialog, layer, feature):
                         <prop k="vertical_anchor_point" v="1"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="0,72,255,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="0,72,255,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <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>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="0,72,255,255"/>
@@ -23313,77 +23306,77 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <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"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <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>
                 </callout>
               </settings>
@@ -23393,13 +23386,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
+            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -23408,47 +23401,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -23479,9 +23472,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23489,12 +23482,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -23502,144 +23495,144 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="None">
+        <field configurationFlags="None" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="None">
+        <field configurationFlags="None" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="None">
+        <field configurationFlags="None" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Sort" configurationFlags="None">
+        <field configurationFlags="None" name="Sort">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="length_km" configurationFlags="None">
+        <field configurationFlags="None" name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="org_fid" configurationFlags="None">
+        <field configurationFlags="None" name="org_fid">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="quadrant" configurationFlags="None">
+        <field configurationFlags="None" name="quadrant">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -23648,95 +23641,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="Distance" name="" index="5"/>
-        <alias field="RouteLen" name="" index="6"/>
-        <alias field="Source" name="" index="7"/>
-        <alias field="Sort" name="" index="8"/>
-        <alias field="day" name="" index="9"/>
-        <alias field="length_km" name="" index="10"/>
-        <alias field="length_m" name="" index="11"/>
-        <alias field="org_fid" name="" index="12"/>
-        <alias field="distance" name="" index="13"/>
-        <alias field="quadrant" name="" index="14"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="quadrant" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="Sort"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="org_fid"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="quadrant"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Sort" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="org_fid" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="quadrant" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="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="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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="Sort" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
-        <constraint field="org_fid" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="quadrant" desc="" exp=""/>
+        <constraint exp="" desc="" field="Name"/>
+        <constraint exp="" desc="" field="descriptio"/>
+        <constraint exp="" desc="" field="timestamp"/>
+        <constraint exp="" desc="" field="begin"/>
+        <constraint exp="" desc="" field="end"/>
+        <constraint exp="" desc="" field="Distance"/>
+        <constraint exp="" desc="" field="RouteLen"/>
+        <constraint exp="" desc="" field="Source"/>
+        <constraint exp="" desc="" field="Sort"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="length_km"/>
+        <constraint exp="" desc="" field="length_m"/>
+        <constraint exp="" desc="" field="org_fid"/>
+        <constraint exp="" desc="" field="distance"/>
+        <constraint exp="" desc="" field="quadrant"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="org_fid" width="-1" hidden="0"/>
-          <column type="field" name="distance" width="-1" hidden="0"/>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="descriptio" width="-1" hidden="0"/>
-          <column type="field" name="timestamp" width="-1" hidden="0"/>
-          <column type="field" name="begin" width="-1" hidden="0"/>
-          <column type="field" name="end" width="-1" hidden="0"/>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="field" name="length_km" width="-1" hidden="0"/>
-          <column type="field" name="Sort" width="-1" hidden="0"/>
-          <column type="field" name="quadrant" width="-1" hidden="0"/>
-          <column type="field" name="day" width="-1" hidden="0"/>
-          <column type="field" name="length_m" width="-1" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23785,21 +23778,21 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="quadrant" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="Distance" reuseLastValue="0"/>
@@ -23823,1695 +23816,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
-      <extent>
-        <xmin>18.37543911768802474</xmin>
-        <ymin>-33.95582126985814853</ymin>
-        <xmax>18.42275999405387665</xmax>
-        <ymax>-33.90013265894425842</ymax>
-      </extent>
-      <wgs84extent>
-        <xmin>18.37543911768802474</xmin>
-        <ymin>-33.95582126985814853</ymin>
-        <xmax>18.42275999405387665</xmax>
-        <ymax>-33.90013265894425842</ymax>
-      </wgs84extent>
-      <id>route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7</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_m:integer(6,0)&amp;field=length_km: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>
-      </keywordList>
-      <layername>route_markers</layername>
-      <srs>
-        <spatialrefsys nativeFormat="Wkt">
-          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent/>
-      </resourceMetadata>
-      <provider encoding="">memory</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <metadataUrls/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-        <Private>0</Private>
-      </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
-        <fixedRange>
-          <start></start>
-          <end></end>
-        </fixedRange>
-      </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
-        <data-defined-properties>
-          <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
-          </Option>
-        </data-defined-properties>
-        <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-              <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="225,89,137,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="align_dash_pattern" v="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"/>
-              <prop k="customdash_unit" v="MM"/>
-              <prop k="dash_pattern_offset" v="0"/>
-              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="dash_pattern_offset_unit" v="MM"/>
-              <prop k="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="225,89,137,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.6"/>
-              <prop k="line_width_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="trim_distance_end" v="0"/>
-              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_end_unit" v="MM"/>
-              <prop k="trim_distance_start" v="0"/>
-              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_start_unit" v="MM"/>
-              <prop k="tweak_dash_pattern_on_corners" v="0"/>
-              <prop k="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileLineSymbol>
-        <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-              <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="161,64,98,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
-              </Option>
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="225,89,137,255"/>
-              <prop k="joinstyle" v="bevel"/>
-              <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="161,64,98,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileFillSymbol>
-        <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-              <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="161,64,98,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
-              </Option>
-              <prop k="angle" v="0"/>
-              <prop k="cap_style" v="square"/>
-              <prop k="color" v="225,89,137,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="diamond"/>
-              <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="161,64,98,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.2"/>
-              <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="3"/>
-              <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" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileMarkerSymbol>
-      </elevation>
-      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" 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}">
-            <settings calloutType="simple">
-              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
-                <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
-                        <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-                      <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
-                      </Option>
-                      <prop k="angle" v="0"/>
-                      <prop k="cap_style" v="square"/>
-                      <prop k="color" v="213,180,60,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" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
-                        <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                      <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
-                      </Option>
-                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="color" v="0,0,0,255"/>
-                      <prop k="joinstyle" v="round"/>
-                      <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="0,0,0,255"/>
-                      <prop k="outline_style" v="solid"/>
-                      <prop k="outline_width" v="1"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
-                            </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
-                            </Option>
-                          </Option>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
-                </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}">
-            <settings calloutType="simple">
-              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
-                <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
-                        <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-                      <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
-                      </Option>
-                      <prop k="angle" v="0"/>
-                      <prop k="cap_style" v="square"/>
-                      <prop k="color" v="213,180,60,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" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
-                        <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                      <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
-                      </Option>
-                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="color" v="0,0,0,255"/>
-                      <prop k="joinstyle" v="round"/>
-                      <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="0,0,0,255"/>
-                      <prop k="outline_style" v="solid"/>
-                      <prop k="outline_width" v="1"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
-                            </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
-                            </Option>
-                          </Option>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
-                </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}">
-              <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
-                  <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                        <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="210,32,39,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="210,32,39,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="210,32,39,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <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="210,32,39,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
-                            <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
-                        </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
-                        </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
-                        </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{7539ef8a-1068-4b69-a2cc-c8e9b0369bb7}">
-              <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
-                  <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                        <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="103,34,144,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="103,34,144,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <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="103,34,144,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
-                            <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
-                        </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
-                        </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
-                        </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = '5KM'" description="5KM" key="{8573f5c5-a6be-456b-8bc8-6817ef1a8c90}">
-              <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
-                  <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                        <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="145,211,55,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="145,211,55,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="145,211,55,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <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="145,211,55,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
-                            <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
-                        </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
-                        </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
-                        </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{a7469442-5b53-4ac3-b1ce-1af4427c496f}">
-              <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
-                  <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-                        <Option type="Map">
-                          <Option type="QString" name="angle" value="0"/>
-                          <Option type="QString" name="cap_style" value="square"/>
-                          <Option type="QString" name="color" value="133,182,111,255"/>
-                          <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                          <Option type="QString" name="joinstyle" value="bevel"/>
-                          <Option type="QString" name="name" value="circle"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="0"/>
-                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="scale_method" value="diameter"/>
-                          <Option type="QString" name="size" value="2"/>
-                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="size_unit" value="MM"/>
-                          <Option type="QString" name="vertical_anchor_point" value="1"/>
-                        </Option>
-                        <prop k="angle" v="0"/>
-                        <prop k="cap_style" v="square"/>
-                        <prop k="color" v="133,182,111,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" name="name" value=""/>
-                            <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                        <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="0,72,255,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="0,72,255,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="0,72,255,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <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="0,72,255,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
-                            <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-          </rule>
-        </rules>
-      </labeling>
-      <customproperties>
-        <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
-          </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
-        </Option>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
-          <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                </Option>
-                <prop k="align_dash_pattern" v="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"/>
-                <prop k="customdash_unit" v="MM"/>
-                <prop k="dash_pattern_offset" v="0"/>
-                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="dash_pattern_offset_unit" v="MM"/>
-                <prop k="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="35,35,35,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0.26"/>
-                <prop k="line_width_unit" v="MM"/>
-                <prop k="offset" v="0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="ring_filter" v="0"/>
-                <prop k="trim_distance_end" v="0"/>
-                <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_end_unit" v="MM"/>
-                <prop k="trim_distance_start" v="0"/>
-                <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_start_unit" v="MM"/>
-                <prop k="tweak_dash_pattern_on_corners" v="0"/>
-                <prop k="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </axisSymbol>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
-        <properties>
-          <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
-      <referencedLayers/>
-      <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="descriptio" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="timestamp" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="begin" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="end" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="RouteLen" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Source" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Sort" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="day" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_m" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_km" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="org_fid" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="quadrant" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
-      <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="Distance" name="" index="5"/>
-        <alias field="RouteLen" name="" index="6"/>
-        <alias field="Source" name="" index="7"/>
-        <alias field="Sort" name="" index="8"/>
-        <alias field="day" name="" index="9"/>
-        <alias field="length_m" name="" index="10"/>
-        <alias field="length_km" name="" index="11"/>
-        <alias field="org_fid" name="" index="12"/>
-        <alias field="distance" name="" index="13"/>
-        <alias field="quadrant" name="" index="14"/>
-      </aliases>
-      <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="quadrant" applyOnUpdate="0"/>
-      </defaults>
-      <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Sort" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="org_fid" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="quadrant" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="Sort" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="org_fid" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="quadrant" desc="" exp=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-      </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
-        <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="org_fid" width="-1" hidden="0"/>
-          <column type="field" name="distance" width="-1" hidden="0"/>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="descriptio" width="-1" hidden="0"/>
-          <column type="field" name="timestamp" width="-1" hidden="0"/>
-          <column type="field" name="begin" width="-1" hidden="0"/>
-          <column type="field" name="end" width="-1" hidden="0"/>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="field" name="length_km" width="-1" hidden="0"/>
-          <column type="field" name="Sort" width="-1" hidden="0"/>
-          <column type="field" name="quadrant" width="-1" hidden="0"/>
-          <column type="field" name="day" width="-1" hidden="0"/>
-          <column type="field" name="length_m" width="-1" hidden="0"/>
-        </columns>
-      </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <storedexpressions/>
-      <editform tolerant="1"></editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Sort" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="quadrant" editable="1"/>
-        <field name="timestamp" editable="1"/>
-      </editable>
-      <labelOnTop>
-        <field 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"/>
-      </reuseLastValue>
-      <dataDefinedFieldProperties/>
-      <widgets/>
-      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip>Text</mapTip>
-    </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -25584,58 +23889,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="229,182,54,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -25666,36 +23971,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -25710,44 +24015,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -25770,38 +24075,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -25816,9 +24121,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25829,10 +24134,10 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="&quot;id&quot;"/>
+          <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>
       </customproperties>
       <blendMode>0</blendMode>
@@ -25840,28 +24145,28 @@ def my_form_open(dialog, layer, feature):
       <layerOpacity>1</layerOpacity>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="area" configurationFlags="None">
+        <field configurationFlags="None" name="area">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="rotation" configurationFlags="None">
+        <field configurationFlags="None" name="rotation">
           <editWidget type="">
             <config>
               <Option/>
@@ -25870,35 +24175,35 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="area" name="" index="1"/>
-        <alias field="rotation" name="" index="2"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="area"/>
+        <alias index="2" name="" field="rotation"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="area" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="area"/>
+        <default applyOnUpdate="0" expression="" field="rotation"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="area" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="rotation" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="area" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="area"/>
+        <constraint exp="" desc="" field="rotation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="area" width="-1" hidden="0"/>
-          <column type="field" name="rotation" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <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="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25921,7 +24226,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -25986,7 +24291,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -26011,58 +24316,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="196,60,57,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -26093,36 +24398,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -26137,44 +24442,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -26197,49 +24502,49 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
           <rule symbol="0" label="All distances" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="1">
+            <layer locked="1" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,0"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="0.5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -26262,20 +24567,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26287,15 +24592,15 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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="StringList" name="dualview/previewExpressions">
-            <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 value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -26304,47 +24609,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26375,9 +24680,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26385,12 +24690,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -26398,103 +24703,103 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="length_km" configurationFlags="None">
+        <field configurationFlags="None" name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="org_fid" configurationFlags="None">
+        <field configurationFlags="None" name="org_fid">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="first_runn" configurationFlags="None">
+        <field configurationFlags="None" name="first_runn">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="last_runne" configurationFlags="None">
+        <field configurationFlags="None" name="last_runne">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -26503,85 +24808,85 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="RouteLen" name="" index="5"/>
-        <alias field="Source" name="" index="6"/>
-        <alias field="length_m" name="" index="7"/>
-        <alias field="length_km" name="" index="8"/>
-        <alias field="org_fid" name="" index="9"/>
-        <alias field="distance" name="" index="10"/>
-        <alias field="first_runn" name="" index="11"/>
-        <alias field="last_runne" name="" index="12"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="first_runn" applyOnUpdate="0"/>
-        <default expression="" field="last_runne" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="org_fid"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="first_runn"/>
+        <default applyOnUpdate="0" expression="" field="last_runne"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="org_fid" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="first_runn" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="last_runne" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="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="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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="org_fid" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="first_runn" desc="" exp=""/>
-        <constraint field="last_runne" desc="" exp=""/>
+        <constraint exp="" desc="" field="Name"/>
+        <constraint exp="" desc="" field="descriptio"/>
+        <constraint exp="" desc="" field="timestamp"/>
+        <constraint exp="" desc="" field="begin"/>
+        <constraint exp="" desc="" field="end"/>
+        <constraint exp="" desc="" field="RouteLen"/>
+        <constraint exp="" desc="" field="Source"/>
+        <constraint exp="" desc="" field="length_m"/>
+        <constraint exp="" desc="" field="length_km"/>
+        <constraint exp="" desc="" field="org_fid"/>
+        <constraint exp="" desc="" field="distance"/>
+        <constraint exp="" desc="" field="first_runn"/>
+        <constraint exp="" desc="" field="last_runne"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;first_runn&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="begin" width="179" hidden="0"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="field" name="length_m" width="-1" hidden="0"/>
-          <column type="field" name="length_km" width="-1" hidden="0"/>
-          <column type="field" name="org_fid" width="-1" hidden="0"/>
-          <column type="field" name="first_runn" width="-1" hidden="0"/>
-          <column type="field" name="last_runne" width="-1" hidden="0"/>
-          <column type="field" name="descriptio" width="-1" hidden="0"/>
-          <column type="field" name="timestamp" width="-1" hidden="0"/>
-          <column type="field" name="end" width="-1" hidden="0"/>
-          <column type="field" name="distance" width="-1" hidden="0"/>
+          <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="-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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26640,31 +24945,31 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -26672,7 +24977,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -26745,58 +25050,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="190,178,151,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -26827,36 +25132,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -26871,44 +25176,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -26931,58 +25236,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="123,211,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -27013,50 +25318,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="4;1;1;1"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1.25"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -27087,30 +25392,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -27130,33 +25435,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -27172,32 +25477,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@1@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -27212,9 +25517,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -27227,11 +25532,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -27240,47 +25545,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -27311,9 +25616,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27321,12 +25626,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -27334,17 +25639,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -27353,30 +25658,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27412,8 +25717,8 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -27421,7 +25726,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -27494,58 +25799,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,82,45,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -27576,36 +25881,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -27620,44 +25925,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -27680,44 +25985,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
+      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="label" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="15" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -27732,66 +26037,66 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="0" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <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>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -27800,47 +26105,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -27871,9 +26176,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27881,12 +26186,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -27894,17 +26199,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label" configurationFlags="None">
+        <field configurationFlags="None" name="label">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -27913,30 +26218,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="label" name="" index="1"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="label"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="label"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="label" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="label" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27972,8 +26277,8 @@ def my_form_open(dialog, layer, feature):
         <field name="label" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -27981,7 +26286,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -28046,7 +26351,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -28071,58 +26376,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="125,139,143,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28153,36 +26458,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -28197,44 +26502,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -28257,46 +26562,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
+      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="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}">
             <settings calloutType="simple">
-              <text-style textColor="31,120,180,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="label" fontFamily="Myriad Pro" namedStyle="Bold" fontWordSpacing="0" fontItalic="0" fontSize="8" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="75" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferSize="0.75" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0.5" shapeRadiiY="0.5" shapeBorderWidth="0.75" shapeJoinStyle="128" shapeOffsetY="-0.14999999999999999" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeSizeType="0" shapeSizeY="0.29999999999999999" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,204" shapeOpacity="0.59999999999999998" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,204"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="31,120,206,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.75"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,204"/>
@@ -28311,56 +26616,56 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="1" geometryGenerator="" lineAnchorType="0" xOffset="1" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="0" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="1" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="5" obstacleFactor="0.76000000000000001" maxNumLabels="6" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
@@ -28369,11 +26674,11 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -28382,47 +26687,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -28453,9 +26758,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -28463,12 +26768,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -28476,40 +26781,40 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_set" configurationFlags="None">
+        <field configurationFlags="None" name="table_set">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label" configurationFlags="None">
+        <field configurationFlags="None" name="label">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="races" configurationFlags="None">
+        <field configurationFlags="None" name="races">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -28518,40 +26823,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="table_set" name="" index="1"/>
-        <alias field="label" name="" index="2"/>
-        <alias field="races" name="" index="3"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="table_set"/>
+        <alias index="2" name="" field="label"/>
+        <alias index="3" name="" field="races"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="table_set" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="races" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="table_set"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
+        <default applyOnUpdate="0" expression="" field="races"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="table_set" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="races" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="table_set" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="races" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="table_set"/>
+        <constraint exp="" desc="" field="label"/>
+        <constraint exp="" desc="" field="races"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="table_set" width="-1" hidden="0"/>
-          <column type="field" name="label" width="-1" hidden="0"/>
-          <column type="field" name="races" width="130" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28589,10 +26894,10 @@ def my_form_open(dialog, layer, feature):
         <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="table_set"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="table_set" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -28626,8 +26931,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_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
-    <layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
+    <layer id="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -28958,348 +27262,269 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option type="QString" name="name" value=""/>
+      <Option value="" type="QString" name="name"/>
       <Option name="properties"/>
-      <Option type="QString" name="type" value="collection"/>
+      <Option value="collection" type="QString" name="type"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" style="default" expanded="1"/>
+    <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"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="0"/>
+      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <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="Routes/Markers"/>
+        <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="Elevation"/>
-        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="All Routes" has-expanded-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default" expanded="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" 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="water_tables20170921142016467" visible="0" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" style="default" expanded="1"/>
-      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" style="default" expanded="1"/>
-      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="OSM data"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Marshals"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" style="default" expanded="1"/>
+    <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"/>
       <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"/>
+      <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"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Ask Me"/>
+        <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="Ask Me"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-expanded-info="1">
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="1"/>
+    <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 id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing" expanded="1"/>
+      <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="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="water_tables20170921142016467" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
+      <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="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
+        <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-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+    <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 id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
+      <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"/>
       <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"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
+        <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-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="1"/>
+    <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"/>
+      <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"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing" expanded="1"/>
+      <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="{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-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
+      <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="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
         <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"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
+        <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-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal overview" has-expanded-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default" expanded="1"/>
+    <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"/>
       <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 id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing" expanded="1"/>
+      <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"/>
+      <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"/>
+      <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"/>
+      <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"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
         <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-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="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
+      <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="water_tables20170921142016467" visible="0" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" style="default" expanded="1"/>
-      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" style="default" expanded="1"/>
-      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Marshals"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Proposed Routes" has-expanded-info="1">
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="water_tables20170921142016467" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" 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"/>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Marshals"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Routes" has-expanded-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default" expanded="1"/>
+    <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="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
         <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 id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing" expanded="1"/>
+      <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="{29865286-9e35-459b-929c-beb87e7538de}"/>
         <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-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="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
+      <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"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="0" style="default" expanded="1"/>
+      <layer style="default" visible="0" id="water_tables20170921142016467" expanded="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" style="default" expanded="1"/>
+      <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 id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" style="default" expanded="1"/>
+      <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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <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 id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
+      <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 id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
+      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing" expanded="1"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="water_tables20170921142016467" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" style="default" expanded="1"/>
+    <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"/>
+      <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"/>
+      <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"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
         <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="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -29326,31 +27551,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -29365,49 +27590,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -29422,1048 +27647,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </LayoutItem>
-        <GuideCollection visible="1">
-          <Guide position="0" page="0" orientation="2" units="mm"/>
-        </GuideCollection>
-      </PageCollection>
-      <LayoutItem positionOnPage="9.44946,191.611,mm" htmlState="0" size="14.1764,7.471,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="9" referencePoint="0" excludeFromExports="0" visibility="1" labelText="[%&quot;Distance&quot;%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.44946,191.611,mm" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
-          <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <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="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="24.2445,191.81,mm" htmlState="0" size="29.2025,7.272,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="RACE ROUTE" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="24.2445,191.81,mm" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" marginX="0" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
-          <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <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="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="204.225,191.81,mm" htmlState="0" size="57.4836,6.8714,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="204.225,191.81,mm" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
-          <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <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="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="210.038,199.082,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 September 2020" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="210.038,199.082,mm" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
-          <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <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="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="17.4718" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-              </Option>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-      </LayoutItem>
-      <LayoutItem positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.59946,198.832,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-            <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
-            </Option>
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="0,0,0,255"/>
-            <prop k="outline_style" v="solid"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
-            <data_defined_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </data_defined_properties>
-          </layer>
-        </symbol>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.86559,4.09761,mm" size="67.7828,166.874,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.86559,4.09761,mm" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-              </Option>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-            <srsid>3452</srsid>
-            <srid>4326</srid>
-            <authid>EPSG:4326</authid>
-            <description>WGS 84</description>
-            <projectionacronym>longlat</projectionacronym>
-            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-            <geographicflag>true</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
-          <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                </Option>
-                <prop k="align_dash_pattern" v="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"/>
-                <prop k="customdash_unit" v="MM"/>
-                <prop k="dash_pattern_offset" v="0"/>
-                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="dash_pattern_offset_unit" v="MM"/>
-                <prop k="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <prop k="line_width_unit" v="MM"/>
-                <prop k="offset" v="0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="ring_filter" v="0"/>
-                <prop k="trim_distance_end" v="0"/>
-                <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_end_unit" v="MM"/>
-                <prop k="trim_distance_start" v="0"/>
-                <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_start_unit" v="MM"/>
-                <prop k="tweak_dash_pattern_on_corners" v="0"/>
-                <prop k="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </lineStyle>
-          <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
-                </Option>
-                <prop k="angle" v="0"/>
-                <prop k="cap_style" v="square"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
-            <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                  <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
-                  </Option>
-                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="color" v="255,255,255,255"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <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="128,128,128,255"/>
-                  <prop k="outline_style" v="no"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="style" v="solid"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-            <dd_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </dd_properties>
-          </text-style>
-          <LayoutObject>
-            <dataDefinedProperties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </dataDefinedProperties>
-            <customproperties>
-              <Option/>
-            </customproperties>
-          </LayoutObject>
-        </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
-      </LayoutItem>
-      <LayoutItem positionOnPage="9.44946,9.08557,mm" size="282.012,174.44,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="true" position="9.44946,9.08557,mm" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '13000'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '5500'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '24000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.370'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.374'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3975'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '18.36'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.930'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.912'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '-33.959'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-              </Option>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.37000000000000099" ymax="-33.89719473757251222" xmax="18.42303517425787263" ymin="-33.92999999999999972"/>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-            <srsid>3452</srsid>
-            <srid>4326</srid>
-            <authid>EPSG:4326</authid>
-            <description>WGS 84</description>
-            <projectionacronym>longlat</projectionacronym>
-            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-            <geographicflag>true</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
-          <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                </Option>
-                <prop k="align_dash_pattern" v="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"/>
-                <prop k="customdash_unit" v="MM"/>
-                <prop k="dash_pattern_offset" v="0"/>
-                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="dash_pattern_offset_unit" v="MM"/>
-                <prop k="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <prop k="line_width_unit" v="MM"/>
-                <prop k="offset" v="0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="ring_filter" v="0"/>
-                <prop k="trim_distance_end" v="0"/>
-                <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_end_unit" v="MM"/>
-                <prop k="trim_distance_start" v="0"/>
-                <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_start_unit" v="MM"/>
-                <prop k="tweak_dash_pattern_on_corners" v="0"/>
-                <prop k="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </lineStyle>
-          <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
-                </Option>
-                <prop k="angle" v="0"/>
-                <prop k="cap_style" v="square"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
-            <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                  <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
-                  </Option>
-                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="color" v="255,255,255,255"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <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="128,128,128,255"/>
-                  <prop k="outline_style" v="no"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="style" v="solid"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-            <dd_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </dd_properties>
-          </text-style>
-          <LayoutObject>
-            <dataDefinedProperties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </dataDefinedProperties>
-            <customproperties>
-              <Option/>
-            </customproperties>
-          </LayoutObject>
-        </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.10000000000000001"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
-      </LayoutItem>
-      <customproperties>
-        <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfAppendGeoreference" value="1"/>
-          <Option type="QString" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportGeoPdfFeatures" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="QString" name="pdfSimplify" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
-        </Option>
-      </customproperties>
-      <Atlas coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21|Trail)' )" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortAscending="1" coverageLayerName="all_routes" coverageLayerProvider="ogr" filterFeatures="1" sortFeatures="1" sortKey="&quot;Sort&quot;" pageNameExpression="&quot;Distance&quot;" enabled="1"/>
-    </Layout>
-    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
-      <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-            <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
-            </Option>
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="255,255,255,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="0,0,0,255"/>
-            <prop k="outline_style" v="no"/>
-            <prop k="outline_width" v="0.26"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
-            <data_defined_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </data_defined_properties>
-          </layer>
-        </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-          <LayoutObject>
-            <dataDefinedProperties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </dataDefinedProperties>
-            <customproperties>
-              <Option/>
-            </customproperties>
-          </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-              <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
-              </Option>
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="joinstyle" v="miter"/>
-              <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="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30471,15 +27657,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.1,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="110.353,5.04491,mm" blendMode="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="39.4312,46.1,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" zValue="5" rasterBorder="1" groupUuid="" position="110.353,5.04491,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frameJoinStyle="bevel" title="" background="true">
-        <FrameColor alpha="255" blue="128" green="128" red="128"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30487,48 +27673,48 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Unchecked">
+          <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" legend_exp="" name="fencing" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="legend/node-order" value="0,1,2"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option value="0,1,2" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30536,62 +27722,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="98.7828,149.027,mm" size="56.5192,54.5647,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal map - inset" background="true" itemRotation="0" outlineWidthM="0.2,mm" zValue="4" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="98.7828,149.027,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41064302246786966" ymax="-33.89902512102636223" xmax="18.41493455420295433" ymin="-33.90316824413850583"/>
+        <Extent xmin="18.41064302246786966" ymax="-33.89902512102636223" ymin="-33.90316824413850583" xmax="18.41493455420295433"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -30622,44 +27808,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -30682,40 +27868,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -30730,29 +27916,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30760,28 +27946,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview centered="1" position="3" name="Overview 1" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <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">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,65,170,127"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,102"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,65,170,127"/>
@@ -30796,9 +27982,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30806,9 +27992,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30816,69 +28002,69 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="3.53,6.0007,mm" size="142,187.018,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal map - main" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="3.53,6.0007,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41227535330844844" ymax="-33.90042047455022356" xmax="18.41330222336237554" ymin="-33.9017728906146445"/>
+        <Extent xmin="18.41227535330844844" ymax="-33.90042047455022356" ymin="-33.9017728906146445" xmax="18.41330222336237554"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -30909,44 +28095,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -30969,40 +28155,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -31017,29 +28203,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31047,22 +28233,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="290.617,6.0007,mm" size="142.117,187.018,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" opacity="1" blendMode="0" type="65647" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" sectionX="0" referencePoint="2" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" sectionWidth="142.117" sectionY="0" sectionHeight="182.4" positionLock="true" position="290.617,6.0007,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" hideBackgroundIfEmpty="0" hidePageIfEmpty="0" id="" frame="false">
-        <FrameColor alpha="255" blue="119" green="119" red="119"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31070,21 +28256,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="246.665,178.41,mm" size="47.1065,27.6,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="0" outlineWidthM="0.3,mm" pictureHeight="27.6" zValue="1" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="246.665,178.41,mm" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="27.4317">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31092,14 +28278,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>" maxBreakDistance="12" type="65648" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" contentMode="1" resizeMode="0" url="" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
+      <LayoutMultiFrame 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}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31109,53 +28295,53 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="jpg"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropMarginUnit" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="rasterize" value="false"/>
-          <Option type="QString" name="resizeToContentsBottomMargin" value="3.53"/>
-          <Option type="QString" name="resizeToContentsLeftMargin" value="3.53"/>
-          <Option type="QString" name="resizeToContentsRightMargin" value="3.53"/>
-          <Option type="QString" name="resizeToContentsTopMargin" value="3.53"/>
-          <Option type="QString" name="singleFile" value="false"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" hideCoverage="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortAscending="1" coverageLayerName="marshal_positions" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="1" sortKey="position" pageNameExpression="&quot;position&quot;" enabled="1"/>
+      <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"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -31170,49 +28356,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31227,9 +28413,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31237,21 +28423,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionOnPage="286.027,2,mm" size="9.45865,11,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureRotation="330" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="0" outlineWidthM="0.3,mm" pictureHeight="7.97477" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="286.027,2,mm" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderColor="0,0,0,255" mode="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" northMode="0" id="" frame="false" file="arrows/NorthArrow_11.svg" pictureWidth="6.31767">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31259,47 +28445,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="285.027,205.886,mm" htmlState="0" size="142.543,10.3185,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="270" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" labelText="[%upper( &quot;area&quot; )%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="285.027,205.886,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31314,65 +28500,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem lineCapStyle="square" maxBarWidth="150" type="65646" opacity="1" outlineWidthM="0.3,mm" unitType="meters" numSubdivisions="1" positionOnPage="7,189.669,mm" blendMode="0" minBarWidth="50" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" visibility="1" frame="false" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" style="Single Box" alignment="0" labelHorizontalPlacement="0" itemRotation="0" size="145.54,16.2165,mm" positionLock="true" unitLabel="m" referencePoint="0" labelVerticalPlacement="0" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" zValue="2" subdivisionsHeight="1.5" segmentMillimeters="26.3519" groupUuid="" position="7,189.669,mm" id="" numSegments="4" numUnitsPerSegment="100" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" lineJoinStyle="miter" segmentSizeMode="1" boxContentSpace="1" labelBarSpace="3" frameJoinStyle="miter" numSegmentsLeft="2" background="false" height="3" outlineWidth="0.3">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31387,75 +28573,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" green="0" red="0"/>
+        <strokeColor red="0" green="0" blue="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" name="decimal_separator" value=""/>
-            <Option type="int" name="decimals" value="6"/>
-            <Option type="int" name="rounding_type" value="0"/>
-            <Option type="bool" name="show_plus" value="false"/>
-            <Option type="bool" name="show_thousand_separator" value="true"/>
-            <Option type="bool" name="show_trailing_zeros" value="false"/>
-            <Option type="QChar" name="thousand_separator" value=""/>
+            <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>
         </numericFormat>
-        <fillColor alpha="255" blue="0" green="0" red="0"/>
-        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
+        <fillColor red="0" green="0" blue="0" alpha="255"/>
+        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
         <lineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.3"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -31486,52 +28672,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.3"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -31562,52 +28748,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.3"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -31638,36 +28824,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -31682,36 +28868,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31726,87 +28912,87 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem positionOnPage="7,5.5,mm" size="278.027,180.318,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Start/Finish" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="330" positionLock="true" position="7,5.5,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="rotation"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="rotation" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="id"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="id" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="angle" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40843143571575169" ymax="-33.89880140828828559" xmax="18.41790915398017958" ymin="-33.90494830469008747"/>
+        <Extent xmin="18.40843143571575169" ymax="-33.89880140828828559" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="5" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="1" intervalY="5" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="3" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="4" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="195,195,195,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -31837,44 +29023,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -31897,9 +29083,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -31916,32 +29102,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -31956,29 +29142,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31986,65 +29172,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
-          <Option type="QString" name="svgCropMarginBottom" value="0"/>
-          <Option type="QString" name="svgCropMarginLeft" value="0"/>
-          <Option type="QString" name="svgCropMarginRight" value="0"/>
-          <Option type="QString" name="svgCropMarginTop" value="0"/>
-          <Option type="QString" name="svgCropToContents" value="true"/>
-          <Option type="QString" name="svgDisableRasterTiles" value="0"/>
-          <Option type="QString" name="svgGroupLayers" value="false"/>
-          <Option type="QString" name="svgIncludeMetadata" value="1"/>
-          <Option type="QString" name="svgTextFormat" value="0"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortAscending="1" coverageLayerName="start_finish_area" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="1" sortKey="area" pageNameExpression="&quot;area&quot;" enabled="1"/>
+      <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"/>
     </Layout>
-    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -32059,49 +29245,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -32116,9 +29302,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32126,47 +29312,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionOnPage="6.76779,190.27,mm" htmlState="0" size="148.46,7.36972,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="11" referencePoint="0" excludeFromExports="0" visibility="1" labelText="FENCING: [% &quot;name&quot; %]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="6.76779,190.27,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32181,65 +29367,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="211.295,197.64,mm" htmlState="0" size="27.7839,7.51682,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="10" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="211.295,197.64,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32254,65 +29440,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="115.637,198.083,mm" htmlState="0" size="67.0856,7.80192,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="9" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="115.637,198.083,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32327,65 +29513,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="59.5581,198.083,mm" htmlState="0" size="53.0017,7.80192,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="59.5581,198.083,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32400,65 +29586,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="6.76779,198.083,mm" htmlState="0" size="52.7903,7.80192,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Page [% @atlas_featurenumber %]" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="6.76779,198.083,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32473,39 +29659,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="243.098,175.353,mm" size="49.3143,29.8354,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="8" outlineWidthM="0.3,mm" pictureHeight="29.8354" zValue="6" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="243.098,175.353,mm" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="29.6535">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32513,47 +29699,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="182.723,190.271,mm" htmlState="0" size="56.3557,7.36902,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 September 2020" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="182.723,190.271,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32568,60 +29754,60 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="6.91779,197.79,mm" size="232.01,0.14328,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="6.91779,197.79,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32636,55 +29822,55 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem lineCapStyle="square" maxBarWidth="100" type="65646" opacity="1" outlineWidthM="0.3,mm" unitType="meters" numSubdivisions="1" positionOnPage="6.76779,2.8482,mm" blendMode="0" minBarWidth="25" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" visibility="1" frame="false" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" style="Double Box" alignment="0" labelHorizontalPlacement="0" itemRotation="0" size="95.0404,15.8378,mm" positionLock="true" unitLabel="m" referencePoint="0" labelVerticalPlacement="0" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" zValue="3" subdivisionsHeight="1.5" segmentMillimeters="28.4264" groupUuid="" position="6.76779,2.8482,mm" id="" numSegments="2" numUnitsPerSegment="10" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" lineJoinStyle="round" segmentSizeMode="1" boxContentSpace="0.2" labelBarSpace="1" frameJoinStyle="miter" numSegmentsLeft="2" background="false" height="2" outlineWidth="0.2">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32699,75 +29885,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" green="0" red="0"/>
+        <strokeColor red="0" green="0" blue="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" name="decimal_separator" value=""/>
-            <Option type="int" name="decimals" value="6"/>
-            <Option type="int" name="rounding_type" value="0"/>
-            <Option type="bool" name="show_plus" value="false"/>
-            <Option type="bool" name="show_thousand_separator" value="true"/>
-            <Option type="bool" name="show_trailing_zeros" value="false"/>
-            <Option type="QChar" name="thousand_separator" value=""/>
+            <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>
         </numericFormat>
-        <fillColor alpha="255" blue="0" green="0" red="0"/>
-        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
+        <fillColor red="0" green="0" blue="0" alpha="255"/>
+        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
         <lineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -32798,52 +29984,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -32874,52 +30060,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -32950,36 +30136,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -32994,36 +30180,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -33038,24 +30224,24 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="0" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="256.808,2.9982,mm" blendMode="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="38.1563,54.9504,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" zValue="2" rasterBorder="1" groupUuid="" position="256.808,2.9982,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter" title="" background="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33063,52 +30249,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="Bold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
-            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
+          <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>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" legend_exp="" name="fencing" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-                  <Option type="QString" name="legend/expressionFilter" value=""/>
-                  <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <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>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33116,44 +30302,44 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="6.76779,9.35102,mm" size="283.418,180.92,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Fencing" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="6.76779,9.35102,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
                   <Option type="Map" name="transformer">
                     <Option type="Map" name="d">
-                      <Option type="double" name="exponent" value="1"/>
-                      <Option type="double" name="maxOutput" value="360"/>
-                      <Option type="double" name="maxValue" value="0"/>
-                      <Option type="double" name="minOutput" value="0"/>
-                      <Option type="double" name="minValue" value="0"/>
-                      <Option type="double" name="nullOutput" value="0"/>
+                      <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>
-                    <Option type="int" name="t" value="0"/>
+                    <Option value="0" type="int" name="t"/>
                   </Option>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="angle" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41635400827248503" ymax="-33.90364055490629625" xmax="18.4172496509604926" ymin="-33.90421228789515595"/>
+        <Extent xmin="18.41635400827248503" ymax="-33.90364055490629625" 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>
@@ -33168,45 +30354,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="5" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="1" intervalY="5" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="3" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="4" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="195,195,195,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33237,44 +30423,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33297,9 +30483,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -33316,32 +30502,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33356,29 +30542,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33386,62 +30572,62 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.40000000000000002"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfAppendGeoreference" value="1"/>
-          <Option type="QString" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportGeoPdfFeatures" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="QString" name="pdfSimplify" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="rasterize" value="true"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" 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" sortAscending="1" coverageLayerName="fence_groups" coverageLayerProvider="virtual" filterFeatures="0" sortFeatures="1" sortKey="group" pageNameExpression="&quot;name&quot;" enabled="1"/>
+      <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"/>
     </Layout>
-    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="9" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -33456,49 +30642,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -33513,9 +30699,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33525,47 +30711,47 @@ def my_form_open(dialog, layer, feature):
           <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="4.43449,186.634,mm" htmlState="0" size="83.9998,10.4638,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Directions to Start of Race" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="false" position="4.43449,186.634,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33580,65 +30766,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="4.43449,197.498,mm" htmlState="0" size="48.2923,9.511,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Gun Run" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="false" position="4.43449,197.498,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33653,33 +30839,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="5" columnSpace="0" positionOnPage="10.096,10.8563,mm" blendMode="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="59.0766,76,mm" positionLock="false" referencePoint="0" symbolAlignment="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" zValue="6" rasterBorder="1" groupUuid="" position="10.096,10.8563,mm" id="" lineSpacing="2" symbolWidth="9" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frameJoinStyle="round" title="" legendFilterByMap="1" background="true">
-        <FrameColor alpha="255" blue="139" green="139" red="139"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33687,52 +30873,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="subgroup" indent="0">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" marginLeft="3" name="symbolLabel" indent="0" marginTop="2.5">
-            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
+          <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>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Ask Me" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Ask Me" groupLayer="" expanded="1">
             <customproperties>
               <Option type="Map">
-                <Option type="QString" name="legend/title-style" value="hidden"/>
+                <Option value="hidden" type="QString" name="legend/title-style"/>
               </Option>
             </customproperties>
-            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" source="./poi_labels.shp|layername=poi_labels" legend_exp="" name="poi_labels" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="legend/label-0" value="Start/Finish"/>
-                  <Option type="QString" name="legend/label-1" value="Toilets"/>
-                  <Option type="QString" name="legend/label-2" value="Tog Bag Drop-off"/>
-                  <Option type="QString" name="legend/label-3" value="Road Closed to Cars"/>
-                  <Option type="QString" name="legend/label-4" value="MyCiti Drop-off"/>
-                  <Option type="QString" name="legend/label-5" value="Parking"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <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>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" name="directions_to_start" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="legend/label-0" value="To 21KM Start (06:30)"/>
-                  <Option type="QString" name="legend/label-1" value="To 10KM Start (07:30)"/>
-                  <Option type="QString" name="legend/label-2" value="To 5KM Start (08:30)"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <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>
               </customproperties>
             </layer-tree-layer>
@@ -33740,47 +30926,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="221.862,190.027,mm" htmlState="0" size="27.7839,6.871,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="false" position="221.862,190.027,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33795,65 +30981,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="197.975,197.498,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="false" position="197.975,197.498,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33868,39 +31054,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="249.646,179.724,mm" size="42.9838,24.3824,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="24.3824" zValue="3" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="249.646,179.724,mm" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="24.2337">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33908,42 +31094,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="4.58449,197.248,mm" size="244.912,0.1,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="4.58449,197.248,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -33958,46 +31144,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="4.43449,6.411,mm" size="288.007,183.616,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Ask Me" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="false" position="4.43449,6.411,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39762336729721071" ymax="-33.8970204297764468" xmax="18.41789384089274151" ymin="-33.90994364588821952"/>
+        <Extent xmin="18.39762336729721071" ymax="-33.8970204297764468" 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>
@@ -34012,45 +31198,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -34081,44 +31267,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -34141,40 +31327,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -34189,29 +31375,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34219,56 +31405,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" sortFeatures="0" pageNameExpression="" enabled="0"/>
+      <Atlas hideCoverage="0" pageNameExpression="" sortFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" coverageLayer="" enabled="0"/>
     </Layout>
-    <Layout name="All Routes" units="mm" printResolution="144" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -34283,49 +31469,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -34340,9 +31526,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34352,47 +31538,47 @@ def my_form_open(dialog, layer, feature):
           <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="200.171,199.082,mm" htmlState="0" size="61.5373,6.8714,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="13" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 2.5" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="200.171,199.082,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34407,65 +31593,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.7863,192.073,mm" htmlState="0" size="61.5373,6.60801,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="12" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Gun Run 2022: [%&quot;Source&quot;%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.7863,192.073,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34480,65 +31666,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.7863,199.082,mm" htmlState="0" size="61.5373,6.60801,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="11" referencePoint="0" excludeFromExports="0" visibility="1" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.7863,199.082,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34553,39 +31739,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="15.9472" zValue="10" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" northMode="0" id="" frame="false" file="../GunRun2022_250.png" pictureWidth="29.7523">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34593,42 +31779,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.57644,198.832,mm" size="251.982,0.1,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="9" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.57644,198.832,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -34643,321 +31829,321 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.57644,5.42566,mm" size="107.861,186.385,mm" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="9.57644,5.42566,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" mapFlags="0" id="Trail Finish" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39314911415855391" ymax="-33.90007566747966905" xmax="18.41187375074135701" ymin="-33.93243205975926458"/>
+        <Extent xmin="18.39314911415855391" ymax="-33.90007566747966905" ymin="-33.93243205975926458" xmax="18.41187375074135701"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="112.643,4.09761,mm" size="179.156,189.279,mm" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="112.643,4.09761,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" mapFlags="0" id="Trail Start" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3924263991010406" ymax="-33.92484901666441743" xmax="18.42354248737832023" ymin="-33.95772328900195447"/>
+        <Extent xmin="18.3924263991010406" ymax="-33.92484901666441743" ymin="-33.95772328900195447" xmax="18.42354248737832023"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.86559,4.09761,mm" size="67.7828,166.874,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.86559,4.09761,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapFlags="0" id="Left inset 21KM" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37399999999999878" ymax="-33.91681492292400435" xmax="18.38626092146919788" ymin="-33.94700000000000273"/>
+        <Extent xmin="18.37399999999999878" ymax="-33.91681492292400435" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="126.141,118.975,mm" size="113.3,76.1023,mm" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="126.141,118.975,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" mapFlags="0" id="Bottom inset 21KM" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="144" green="34" red="103"/>
-        <BackgroundColor alpha="255" blue="215" green="175" red="200"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41509620662891678" ymax="-33.91132718340826813" xmax="18.42329132157224336" ymin="-33.9168317482614512"/>
+        <Extent xmin="18.41509620662891678" ymax="-33.91132718340826813" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
         <LayerSet/>
-        <AtlasMap scalingMode="0" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="19.6693,7.89412,mm" size="68.3676,117.12,mm" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="0" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="19.6693,7.89412,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" mapFlags="0" id="End inset Trail" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.4044900556177744" ymax="-33.90099106513847005" xmax="18.41240136424316276" ymin="-33.91454383501641701"/>
+        <Extent xmin="18.4044900556177744" ymax="-33.90099106513847005" ymin="-33.91454383501641701" xmax="18.41240136424316276"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="170.062,49.6297,mm" size="63.655,88.3012,mm" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="0" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="170.062,49.6297,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" mapFlags="0" id="Start inset Trail" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41445559427620893" ymax="-33.94253141264477591" xmax="18.4185691326545431" ymin="-33.94823764719958348"/>
+        <Extent xmin="18.41445559427620893" ymax="-33.94253141264477591" ymin="-33.94823764719958348" xmax="18.4185691326545431"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="200.321,125.314,mm" size="75.8756,69.7635,mm" uuid="{917a530c-14f4-4ed8-b109-961939435221}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="0" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="200.321,125.314,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" mapFlags="0" id="Contour inset Trail" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41234259163472942" ymax="-33.94692690566557047" xmax="18.42332635419156972" ymin="-33.95702588572736147"/>
+        <Extent xmin="18.41234259163472942" ymax="-33.94692690566557047" ymin="-33.95702588572736147" xmax="18.42332635419156972"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.50144,5.50066,mm" size="282.372,186.234,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="true" position="9.50144,5.50066,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapFlags="0" id="Main Map" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" 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"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" 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.3985'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" 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.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36400000000000077" ymax="-33.89971434483385337" xmax="18.4538899796794631" ymin="-33.95900000000000318"/>
+        <Extent xmin="18.36400000000000077" ymax="-33.89975491889535419" ymin="-33.95900000000000318" xmax="18.45389078066072486"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -34988,44 +32174,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -35048,40 +32234,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -35096,29 +32282,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35126,34 +32312,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview centered="0" position="3" name="Overview 1" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" inverted="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}">
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <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">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="alpha">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                    <Option type="int" name="type" value="3"/>
+                    <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>
                 </Option>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="103,34,144,26"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="103,34,144,26"/>
@@ -35168,9 +32354,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35178,9 +32364,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35188,63 +32374,63 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.06" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="int" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="int" name="pdfAppendGeoreference" value="1"/>
-          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="int" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~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_7b072d1e_ad75_4233_a306_a6e83facfea1~~~route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
-          <Option type="int" name="pdfLosslessImages" value="0"/>
-          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="int" name="pdfSimplify" value="1"/>
-          <Option type="int" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortAscending="1" coverageLayerName="all_routes" coverageLayerProvider="ogr" filterFeatures="1" sortFeatures="1" sortKey="&quot;Sort&quot;" pageNameExpression="&quot;Distance&quot;" enabled="1"/>
+      <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"/>
     </Layout>
-    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -35259,49 +32445,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="594,841,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -35316,9 +32502,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35326,15 +32512,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="25.5925,18.7971,mm" blendMode="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" visibility="1" fontColor="#000000" wrapChar="" frame="false" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="4,4,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" zValue="8" rasterBorder="1" groupUuid="" position="25.5925,18.7971,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frameJoinStyle="miter" title="" background="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35342,37 +32528,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes20170907054841602" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer checked="Qt::Checked" legend_exp="" name="all_routes" id="all_routes20170907054841602" legend_split_behavior="0" patch_size="0,0" expanded="1">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="QString" name="showFeatureCount" value="0"/>
+                  <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>
               </customproperties>
             </layer-tree-layer>
@@ -35380,47 +32566,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.2963,808.939,mm" htmlState="0" size="91.9494,15.0649,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="MARSHAL POSITIONS" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="5.2963,808.939,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35435,65 +32621,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="430.403,825.052,mm" htmlState="0" size="56.6212,15.3656,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.2" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="430.403,825.052,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35508,65 +32694,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="372.175,808.942,mm" htmlState="0" size="114.848,15.0635,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="372.175,808.942,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35581,39 +32767,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="489.557,775.395,mm" size="100.498,63.9757,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="8" outlineWidthM="0.3,mm" pictureHeight="63.9757" zValue="3" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="489.557,775.395,mm" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="63.5856">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35621,42 +32807,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.4463,824.155,mm" size="481.428,0.606138,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="5.4463,824.155,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -35671,90 +32857,90 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="3.94474,5.25965,mm" size="584.759,811.213,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal overview" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="3.94474,5.25965,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37434415142052657" ymax="-33.89072661913806428" xmax="18.42299397558693741" ymin="-33.95821655848814657"/>
+        <Extent xmin="18.37434415142052657" ymax="-33.89072661913806428" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0"/>
+        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortAscending="1" coverageLayerName="complete_marshal_overview" coverageLayerProvider="virtual" filterFeatures="0" sortFeatures="1" sortKey="page" pageNameExpression="&quot;page&quot;" enabled="1"/>
+      <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"/>
     </Layout>
-    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -35769,49 +32955,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -35826,9 +33012,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35838,15 +33024,15 @@ def my_form_open(dialog, layer, feature):
           <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="244.484,130.172,mm" blendMode="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="34.45,40.8,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" zValue="15" rasterBorder="1" groupUuid="" position="244.484,130.172,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="0" frameJoinStyle="miter" title="" background="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="185" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35854,35 +33040,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
-            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
+          <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>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Residents Access" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Residents Access" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" name="residents_access_roads" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -35890,47 +33076,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.37446,191.81,mm" htmlState="0" size="194.851,7.272,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="ACCESS ROUTES FOR RESIDENTS" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.37446,191.81,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginX="0" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35945,65 +33131,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="204.225,191.81,mm" htmlState="0" size="57.4836,6.8714,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.1" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="204.225,191.81,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36018,65 +33204,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="210.038,199.082,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="210.038,199.082,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36091,39 +33277,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="17.4718" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36131,42 +33317,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.59946,198.832,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -36181,61 +33367,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.86559,4.09761,mm" size="67.7828,166.874,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Access Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.86559,4.09761,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
+        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" 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>
@@ -36250,45 +33436,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -36319,44 +33505,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -36379,40 +33565,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -36427,29 +33613,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -36457,45 +33643,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.44946,9.08557,mm" size="282.012,175.592,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Access Routes" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="true" position="9.44946,9.08557,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" ymax="-33.89697816224119009" xmax="18.42303507276415431" ymin="-33.92999999999999972"/>
+        <Extent xmin="18.37000000000000099" ymax="-33.89697816224119009" 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>
@@ -36510,45 +33696,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -36579,44 +33765,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -36639,40 +33825,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -36687,29 +33873,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -36717,56 +33903,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="false"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" enabled="1"/>
+      <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"/>
     </Layout>
-    <Layout name="Golf Course Access" units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -36781,49 +33967,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -36838,9 +34024,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -36850,47 +34036,47 @@ def my_form_open(dialog, layer, feature):
           <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="9.37446,191.81,mm" htmlState="0" size="194.851,7.272,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Access to P9 Parking and VIP Tent" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.37446,191.81,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginX="0" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36905,65 +34091,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="204.225,191.81,mm" htmlState="0" size="57.4836,6.8714,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="204.225,191.81,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36978,65 +34164,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="210.038,199.082,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="210.038,199.082,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37051,39 +34237,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="17.4718" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -37091,42 +34277,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.59946,198.832,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -37141,46 +34327,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.44946,7.25098,mm" size="282.012,182.649,mm" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="false" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="false" position="9.44946,7.25098,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40103928699269886" ymax="-33.90319854486631357" xmax="18.40919746780259914" ymin="-33.90848231674397084"/>
+        <Extent xmin="18.40103928699269886" ymax="-33.90319854486631357" 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>
@@ -37195,45 +34381,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -37264,44 +34450,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -37324,40 +34510,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -37372,29 +34558,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -37402,56 +34588,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="false"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" enabled="0"/>
+      <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"/>
     </Layout>
-    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -37466,49 +34652,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,420,mm" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -37523,9 +34709,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -37533,47 +34719,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionOnPage="112.086,406.476,mm" htmlState="1" size="23.5967,8.3142,mm" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="14" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Page [% &quot;page&quot; %] " groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="112.086,406.476,mm" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" marginX="0" halign="4" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37588,33 +34774,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="15.6525,12.5708,mm" blendMode="0" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" visibility="1" fontColor="#000000" wrapChar="" frame="false" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="21.6797,33,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" zValue="8" rasterBorder="1" groupUuid="" position="15.6525,12.5708,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frameJoinStyle="miter" title="" background="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -37622,37 +34808,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="int" name="showFeatureCount" value="0"/>
+                  <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>
               </customproperties>
             </layer-tree-layer>
@@ -37660,47 +34846,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,398.344,mm" htmlState="0" size="45.1194,8.13137,mm" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="MARSHAL POSITIONS" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="5.69321,398.344,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" marginX="0" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37715,65 +34901,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,406.988,mm" htmlState="1" size="118.192,7.80192,mm" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" 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>" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="5.69321,406.988,mm" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" marginX="0" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37788,65 +34974,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="214.292,406.874,mm" htmlState="0" size="27.7839,7.51682,mm" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 3.0" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="214.292,406.874,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" marginX="0" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37861,65 +35047,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="148.501,398.344,mm" htmlState="1" size="93.5757,8.13167,mm" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" 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>" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="148.501,398.344,mm" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" marginX="0" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37934,39 +35120,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="243.319,382.696,mm" size="49.3143,31.2967,mm" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="8" outlineWidthM="0.3,mm" pictureHeight="26.4325" zValue="3" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="243.319,382.696,mm" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../GunRun2022_250.png" pictureWidth="49.3143">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -37974,42 +35160,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.84321,406.626,mm" size="236.083,0.14328,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="5.84321,406.626,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -38024,78 +35210,78 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.03,5.9483,mm" size="286.94,392.396,mm" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal overview" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.03,5.9483,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36924763341120581" ymax="-33.9248732774534929" xmax="18.38613924055453452" ymin="-33.94797288016832226"/>
+        <Extent xmin="18.36924763341120581" ymax="-33.9248732774534929" ymin="-33.94797288016832226" xmax="18.38613924055453452"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="int" name="forceVector" value="0"/>
-          <Option type="int" name="pdfAppendGeoreference" value="1"/>
-          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="int" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~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"/>
-          <Option type="int" name="pdfLosslessImages" value="0"/>
-          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="int" name="pdfSimplify" value="1"/>
-          <Option type="int" name="pdfTextFormat" value="0"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortAscending="1" coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="1" sortKey="page" pageNameExpression="&quot;page&quot;" enabled="1"/>
+      <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"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmin="18.31333691080681803" ymax="-33.87127486098422935" xmax="18.47461092490271284" ymin="-33.95802701381087729">
+    <DefaultViewExtent xmin="18.39483932596524696" ymax="-33.90119829484044089" ymin="-33.91746432349552265" xmax="18.42507820360838267">
       <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>
@@ -38109,10 +35295,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1">
+  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStepUnit="h" timeStep="1" cumulativeTemporalRange="0" frameRate="1"/>
+  <ProjectTimeSettings cumulativeTemporalRange="0" timeStepUnit="h" timeStep="1" frameRate="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider scale="1" offset="0"/>
@@ -38121,29 +35307,29 @@ def my_form_open(dialog, layer, feature):
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option type="QChar" name="decimal_separator" value=""/>
-        <Option type="int" name="decimals" value="6"/>
-        <Option type="int" name="direction_format" value="0"/>
-        <Option type="int" name="rounding_type" value="0"/>
-        <Option type="bool" name="show_plus" value="false"/>
-        <Option type="bool" name="show_thousand_separator" value="true"/>
-        <Option type="bool" name="show_trailing_zeros" value="false"/>
-        <Option type="QChar" name="thousand_separator" value=""/>
+        <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>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option type="QString" name="angle_format" value="DecimalDegrees"/>
-        <Option type="QChar" name="decimal_separator" value=""/>
-        <Option type="int" name="decimals" value="6"/>
-        <Option type="int" name="rounding_type" value="0"/>
-        <Option type="bool" name="show_leading_degree_zeros" value="false"/>
-        <Option type="bool" name="show_leading_zeros" value="false"/>
-        <Option type="bool" name="show_plus" value="false"/>
-        <Option type="bool" name="show_suffix" value="false"/>
-        <Option type="bool" name="show_thousand_separator" value="true"/>
-        <Option type="bool" name="show_trailing_zeros" value="false"/>
-        <Option type="QChar" name="thousand_separator" value=""/>
+        <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>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/Gun Run.qgs.mldata b/GIS Base Map/Gun Run.qgs.mldata
index ba3d08e..41846cc 100644
Binary files a/GIS Base Map/Gun Run.qgs.mldata and b/GIS Base Map/Gun Run.qgs.mldata differ
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 4af4b6f..ba39103 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 saveUser="tim" saveDateTime="2022-08-30T11:53:13" version="3.26.2-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run">
+<qgis version="3.26.2-Buenos Aires" projectname="Gun Run" saveUserFull="Timothy Allen" saveDateTime="2022-09-04T18:41:18" saveUser="tim">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,219 +21,215 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group name="Marshals" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Unchecked" name="Marshals" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" source="./marshal_positions.shp|layername=marshal_positions" legend_exp="" name="marshal_positions" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="marshal_positions"/>
-            <Option type="QString" name="legend/expressionFilter" value=""/>
-            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
-            <Option type="int" name="showFeatureCount" value="1"/>
+            <Option value="marshal_positions" type="QString" 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>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="extra_security20170921130834191" source="./extra_security.shp" legend_exp="" name="extra_security" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshals_by_position20161003112326575" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_exp="" name="marshals_by_position" expanded="1" patch_size="0,0" providerKey="delimitedtext" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="marshals_by_position"/>
+            <Option value="marshals_by_position" type="QString" name="cached_name"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_exp="" name="complete_marshal_overview" expanded="1" patch_size="0,0" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" source="./marshal overviews.shp|layername=marshal overviews" legend_exp="" name="marshal_overviews" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="legend/expressionFilter" value=""/>
-            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Fencing and Cones" expanded="0" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" legend_exp="" name="fencing" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="fencing"/>
-            <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-            <Option type="QString" name="legend/expressionFilter" value=""/>
-            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
+            <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>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" 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="" name="fence_groups" expanded="1" patch_size="0,0" providerKey="virtual" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group name="Markers" expanded="1" groupLayer="" checked="Qt::Checked">
+      <layer-tree-group checked="Qt::Checked" name="Markers" groupLayer="" expanded="1">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" source="Point?crs=EPSG:4326&amp;uid={2bd4c115-aee9-42aa-af5c-425618621c58}" legend_exp="" name="route_markers" expanded="1" patch_size="-1,-1" providerKey="memory" checked="Qt::Checked" legend_split_behavior="0">
+        <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">
           <customproperties>
             <Option type="Map">
-              <Option type="int" name="showFeatureCount" value="1"/>
-            </Option>
-          </customproperties>
-        </layer-tree-layer>
-        <layer-tree-layer id="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7" source="Point?crs=EPSG:4326&amp;uid={40e6cb9e-7c5b-40c3-b431-03ac2c4bba96}" legend_exp="" name="route_markers" expanded="1" patch_size="-1,-1" providerKey="memory" checked="Qt::Unchecked" legend_split_behavior="0">
-          <customproperties>
-            <Option type="Map">
-              <Option type="int" name="showFeatureCount" value="1"/>
+              <Option value="1" type="int" name="showFeatureCount"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="all_routes"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="int" name="showFeatureCount" value="0"/>
+            <Option value="all_routes" type="QString" name="cached_name"/>
+            <Option name="expandedLegendNodes"/>
+            <Option value="0" type="int" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" 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="" name="timelapse" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+    <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">
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="cached_name" value="timelapse"/>
+          <Option value="timelapse" type="QString" name="cached_name"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group name="Feeding Stations" expanded="1" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Checked" name="Feeding Stations" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="water_tables20170921142016467" source="./water_tables.shp" legend_exp="" name="water_tables" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="water_tables"/>
+            <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="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Ask Me" expanded="0" groupLayer="" checked="Qt::Unchecked">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" source="./poi_labels.shp|layername=poi_labels" legend_exp="" name="poi_labels" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="poi_labels"/>
+            <Option value="vipaccess" type="QString" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" name="directions_to_start" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
-        <customproperties>
-          <Option type="Map">
-            <Option type="QString" name="cached_name" value="directions_to_start"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Residents Access" expanded="0" groupLayer="" checked="Qt::Unchecked">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" source="./mayor.shp" legend_exp="" name="mayor" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
-        <customproperties>
-          <Option type="Map">
-            <Option type="QString" name="cached_name" value="mayor"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" source="./viplabels.shp" legend_exp="" name="viplabels" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
-        <customproperties>
-          <Option type="Map">
-            <Option type="QString" name="cached_name" value="viplabels"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" source="./vipaccess.shp" legend_exp="" name="vipaccess" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
-        <customproperties>
-          <Option type="Map">
-            <Option type="QString" name="cached_name" value="vipaccess"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" source="./golfaccess.shp" legend_exp="" name="golfaccess" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" name="residents_access_roads" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="residents_access_roads"/>
+            <Option value="residents_access_roads" type="QString" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" source="./residents_access.shp|layername=residents_access" legend_exp="" name="residents_access" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="OSM data" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="OSM data" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" source="./osm_roads.shp" legend_exp="" name="osm_roads" expanded="0" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="osm_roads [3887]"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="QString" name="showFeatureCount" value="1"/>
+            <Option value="osm_roads [3887]" type="QString" name="cached_name"/>
+            <Option name="expandedLegendNodes"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" source="./osm_places.shp|layername=osm_places" legend_exp="" name="osm_places" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="osm_places [7]"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="QString" name="showFeatureCount" value="1"/>
+            <Option value="osm_places [7]" type="QString" name="cached_name"/>
+            <Option name="expandedLegendNodes"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Start and Finish pages" expanded="0" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" source="./data-comments.shp" legend_exp="" name="data-comments" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" source="./start_finish_area.shp" legend_exp="" name="start_finish_area" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
@@ -241,35 +237,35 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Elevation" expanded="0" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" name="Elevation" groupLayer="" expanded="0">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" source="./capetownelevation-1m.shp" legend_exp="" name="capetownelevation-1m" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Unchecked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="showFeatureCount" value="1"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Map" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" name="Map" groupLayer="" expanded="1">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial" expanded="0" patch_size="0,0" providerKey="gdal" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="GDAL-City of Cape Town 2015 Aerial"/>
+            <Option value="GDAL-City of Cape Town 2015 Aerial" type="QString" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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="" name="Outlines" expanded="1" patch_size="0,0" providerKey="wms" checked="Qt::Checked" legend_split_behavior="0">
+      <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">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="Outlines"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="Outlines" type="QString" name="cached_name"/>
+            <Option name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -299,47 +295,45 @@
       <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_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7</item>
-      <item>route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1</item>
+      <item>route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings tolerance="10" mode="3" type="1" scaleDependencyMode="0" unit="1" minScale="0" intersection-snapping="1" maxScale="0" enabled="0" self-snapping="1">
+  <snapping-settings unit="1" intersection-snapping="1" scaleDependencyMode="0" minScale="0" mode="3" maxScale="0" type="1" tolerance="10" self-snapping="1" enabled="0">
     <individual-layer-settings>
-      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="extra_security20170921130834191" tolerance="0" type="2" units="2" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" type="2" units="1" minScale="0" maxScale="0" enabled="1"/>
-      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" tolerance="12" type="0" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7" tolerance="12" type="0" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="water_tables20170921142016467" tolerance="0" type="2" units="2" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" type="1" units="1" minScale="0" maxScale="0" enabled="0"/>
-      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" type="2" units="1" minScale="0" maxScale="0" enabled="0"/>
+      <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"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <polymorphicRelations/>
-  <mapcanvas name="theMapCanvas" annotationsVisible="1">
+  <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.35711011631522638</xmin>
-      <ymin>-33.95802701381087729</ymin>
-      <xmax>18.43083771939430449</xmax>
-      <ymax>-33.87127486098422935</ymax>
+      <xmin>18.40304680199827914</xmin>
+      <ymin>-33.91746432349552265</ymin>
+      <xmax>18.41687072757535049</xmax>
+      <ymax>-33.90119829484044089</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -360,166 +354,161 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup name="Marshals" open="true" checked="Qt::Checked">
-      <legendlayer drawingOrder="-1" name="marshal_positions" open="true" showFeatureCount="1" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="extra_security" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="marshals_by_position" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="complete_marshal_overview" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="marshal_overviews" open="false" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Fencing and Cones" open="false" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" name="fencing" open="true" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="fence_groups" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Routes" open="true" checked="Qt::Checked">
-      <legendgroup name="Markers" open="true" checked="Qt::Checked">
-        <legendlayer drawingOrder="-1" name="route_markers" open="true" showFeatureCount="1" checked="Qt::Checked">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
-          </filegroup>
-        </legendlayer>
-        <legendlayer drawingOrder="-1" name="route_markers" open="true" showFeatureCount="1" checked="Qt::Unchecked">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
+    <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"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer drawingOrder="-1" name="all_routes" open="true" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer drawingOrder="-1" name="timelapse" open="false" showFeatureCount="0" checked="Qt::Unchecked">
-      <filegroup open="false" hidden="false">
-        <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
+    <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"/>
       </filegroup>
     </legendlayer>
-    <legendgroup name="Feeding Stations" open="true" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" name="water_tables" open="true" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="water_tables20170921142016467"/>
+    <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Ask Me" open="false" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" name="poi_labels" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="directions_to_start" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Residents Access" open="false" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" name="mayor" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="viplabels" open="true" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="vipaccess" open="true" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="golfaccess" open="false" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="residents_access_roads" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="residents_access" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="OSM data" open="true" checked="Qt::Checked">
-      <legendlayer drawingOrder="-1" name="osm_roads" open="false" showFeatureCount="1" checked="Qt::Checked">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="osm_places" open="true" showFeatureCount="1" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Start and Finish pages" open="false" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" name="data-comments" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="start_finish_area" open="true" showFeatureCount="0" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Elevation" open="false" checked="Qt::Unchecked">
-      <legendlayer drawingOrder="-1" name="capetownelevation-1m" open="true" showFeatureCount="1" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
+    <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Map" open="true" checked="Qt::Checked">
-      <legendlayer drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" open="false" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <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"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="Outlines" open="true" showFeatureCount="0" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <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"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer type="annotation" autoRefreshTime="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" autoRefreshEnabled="0" refreshOnNotifyMessage="">
+  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshTime="0" type="annotation" autoRefreshEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -570,7 +559,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer type="raster" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" minScale="1e+08" autoRefreshEnabled="0" maxScale="100000" refreshOnNotifyMessage="">
+    <maplayer minScale="1e+08" refreshOnNotifyEnabled="0" autoRefreshTime="0" maxScale="100000" type="raster" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -635,7 +624,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -646,9 +635,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -666,52 +655,52 @@
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" zoffset="0" enabled="0" zscale="1" symbology="Line">
+      <elevation zscale="1" band="1" symbology="Line" zoffset="0" enabled="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="152,125,183,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -742,36 +731,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="152,125,183,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -786,9 +775,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -797,27 +786,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="WMSBackgroundLayer" value="false"/>
-          <Option type="QString" name="WMSPublishDataSourceUrl" value="false"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="identify/format" value="Value"/>
+          <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>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option type="QString" name="name" value=""/>
+          <Option value="" type="QString" name="name"/>
           <Option name="properties"/>
-          <Option type="QString" name="type" value="collection"/>
+          <Option value="collection" type="QString" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.5" alphaBand="-1" type="multibandcolor" nodataColor="" blueBand="3" greenBand="2" redBand="1">
+        <rasterrenderer opacity="0.5" alphaBand="-1" nodataColor="" type="multibandcolor" redBand="1" greenBand="2" blueBand="3">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -828,14 +817,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation colorizeOn="0" invertColors="0" colorizeGreen="128" colorizeStrength="100" saturation="0" colorizeBlue="128" colorizeRed="255" grayscaleMode="0"/>
+        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
+        <huesaturation colorizeOn="0" grayscaleMode="0" colorizeStrength="100" colorizeBlue="128" saturation="0" colorizeRed="255" colorizeGreen="128" invertColors="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer type="raster" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" minScale="1e+08" autoRefreshEnabled="0" maxScale="0" refreshOnNotifyMessage="">
+    <maplayer minScale="1e+08" refreshOnNotifyEnabled="0" autoRefreshTime="0" maxScale="0" type="raster" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -900,7 +889,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -911,7 +900,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -929,52 +918,52 @@
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" zoffset="0" enabled="0" zscale="1" symbology="Line">
+      <elevation zscale="1" band="1" symbology="Line" zoffset="0" enabled="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="225,89,137,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1005,36 +994,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -1049,9 +1038,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1060,27 +1049,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="WMSBackgroundLayer" value="true"/>
-          <Option type="QString" name="WMSPublishDataSourceUrl" value="false"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="identify/format" value="Undefined"/>
+          <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>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option type="QString" name="name" value=""/>
+          <Option value="" type="QString" name="name"/>
           <Option name="properties"/>
-          <Option type="QString" name="type" value="collection"/>
+          <Option value="collection" type="QString" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.75" alphaBand="-1" type="singlebandcolordata" nodataColor="" band="1">
+        <rasterrenderer opacity="0.75" alphaBand="-1" band="1" nodataColor="" type="singlebandcolordata">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1091,14 +1080,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation colorizeOn="0" invertColors="0" colorizeGreen="128" colorizeStrength="100" saturation="0" colorizeBlue="128" colorizeRed="255" grayscaleMode="0"/>
+        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
+        <huesaturation colorizeOn="0" grayscaleMode="0" colorizeStrength="100" colorizeBlue="128" saturation="0" colorizeRed="255" colorizeGreen="128" invertColors="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1163,7 +1152,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -1177,8 +1166,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" expression="$length * 100" precision="0" comment="" type="6" name="length_km" subType="0" typeName="double precision"/>
-        <field length="-1" expression="$length * 100 * 1000" precision="0" comment="" type="6" name="length_m" subType="0" typeName="double precision"/>
+        <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=""/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1191,58 +1180,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="RouteLen" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="RouteLen" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="229,182,54,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1273,36 +1262,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -1317,44 +1306,44 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -1377,59 +1366,59 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="Active Routes" checkstate="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" description="Only show when active in Atlas" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
-            <rule symbol="1" label="21KM" checkstate="0" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
-            <rule symbol="2" label="10KM" checkstate="0" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
-            <rule symbol="3" label="5KM" checkstate="0" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
-            <rule symbol="4" label="Trail" checkstate="0" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
+          <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>
-          <rule symbol="5" label="Show by day" 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" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule symbol="6" label="21KM" checkstate="0" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule symbol="7" label="10KM" checkstate="0" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule symbol="8" label="5KM" checkstate="0" filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
-            <rule symbol="9" label="Trail" checkstate="0" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <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>
-          <rule symbol="10" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule symbol="11" label="Always show by day" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <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}"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1449,44 +1438,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -1502,32 +1491,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@0@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@0@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -1542,15 +1531,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1558,35 +1547,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1617,36 +1606,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1666,40 +1655,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@0@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1722,38 +1711,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                          <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>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1773,40 +1762,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@0@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1829,47 +1818,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                          <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>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1889,44 +1878,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -1942,32 +1931,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@1@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="210,32,39,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -1982,15 +1971,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1998,35 +1987,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="210,32,39,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2057,36 +2046,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2106,40 +2095,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2162,38 +2151,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2213,40 +2202,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2269,58 +2258,58 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="10" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="10" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2351,56 +2340,56 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="11" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="11" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.46"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2431,45 +2420,45 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2489,44 +2478,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@2@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -2542,32 +2531,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@2@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -2582,15 +2571,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2598,35 +2587,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2657,36 +2646,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2706,40 +2695,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@2@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2762,38 +2751,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2813,40 +2802,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@2@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2869,47 +2858,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2929,44 +2918,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@3@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -2982,32 +2971,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@3@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@3@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="145,211,55,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -3022,15 +3011,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3038,35 +3027,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,211,55,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3097,36 +3086,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3146,40 +3135,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@3@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3202,38 +3191,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3253,40 +3242,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@3@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3309,47 +3298,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3369,44 +3358,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@4@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@4@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,72,255,255"/>
@@ -3422,32 +3411,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@4@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@4@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,72,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,72,255,255"/>
@@ -3462,15 +3451,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3478,35 +3467,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,72,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3537,36 +3526,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3586,40 +3575,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@4@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@4@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3642,38 +3631,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3693,40 +3682,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@4@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@4@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3749,47 +3738,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="5" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="5" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3809,44 +3798,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@5@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@5@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -3862,32 +3851,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@5@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@5@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -3902,15 +3891,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3918,35 +3907,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3977,36 +3966,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4026,40 +4015,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@5@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@5@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4082,38 +4071,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                          <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>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4133,40 +4122,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@5@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@5@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4189,47 +4178,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                          <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>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="6" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="6" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4249,44 +4238,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@6@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@6@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -4302,32 +4291,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@6@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@6@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="210,32,39,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -4342,15 +4331,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4358,35 +4347,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="210,32,39,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4417,36 +4406,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4466,40 +4455,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@6@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@6@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4522,38 +4511,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4573,40 +4562,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@6@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@6@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4629,47 +4618,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="7" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="7" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4689,44 +4678,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@7@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@7@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -4742,32 +4731,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@7@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@7@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -4782,15 +4771,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4798,35 +4787,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4857,36 +4846,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4906,40 +4895,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@7@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@7@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4962,38 +4951,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5013,40 +5002,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@7@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@7@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5069,47 +5058,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="8" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="8" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5129,44 +5118,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@8@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@8@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -5182,32 +5171,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@8@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@8@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="145,211,55,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -5222,15 +5211,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5238,35 +5227,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,211,55,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5297,36 +5286,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5346,40 +5335,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@8@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@8@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5402,38 +5391,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5453,40 +5442,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@8@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@8@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5509,47 +5498,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="9" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="9" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5569,44 +5558,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@9@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@9@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,72,255,255"/>
@@ -5622,32 +5611,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@9@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@9@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,72,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,72,255,255"/>
@@ -5662,15 +5651,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5678,35 +5667,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,72,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5737,36 +5726,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5786,40 +5775,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@9@2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@9@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5842,38 +5831,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5893,40 +5882,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@9@3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@9@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5949,15 +5938,15 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -5970,43 +5959,43 @@
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{adefb6f1-8d28-439f-8c89-3617096e0e41}">
-          <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="{3d6b22ea-4051-4151-bae2-dc441215d183}">
+        <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}">
             <settings calloutType="simple">
-              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="round($length / 1000, 0)" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="164,113,88,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <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>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -6029,34 +6018,34 @@
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -6071,98 +6060,98 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                             <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="1" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="km_marker()" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="LineGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="0" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="quadrant" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="rotation" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
@@ -6171,13 +6160,17 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <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>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -6186,47 +6179,47 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -6257,9 +6250,9 @@
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6267,12 +6260,12 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -6280,202 +6273,202 @@
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="None">
+        <field configurationFlags="None" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="None">
+        <field configurationFlags="None" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="None">
+        <field configurationFlags="None" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Sort" configurationFlags="None">
+        <field configurationFlags="None" name="Sort">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="length_km" configurationFlags="None">
+        <field configurationFlags="None" name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="Distance" name="" index="5"/>
-        <alias field="RouteLen" name="" index="6"/>
-        <alias field="Source" name="" index="7"/>
-        <alias field="Sort" name="" index="8"/>
-        <alias field="day" name="" index="9"/>
-        <alias field="length_km" name="" index="10"/>
-        <alias field="length_m" name="" index="11"/>
+        <alias 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"/>
       </aliases>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="Sort"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Sort" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="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="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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="Sort" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
+        <constraint exp="" desc="" field="Name"/>
+        <constraint exp="" desc="" field="descriptio"/>
+        <constraint exp="" desc="" field="timestamp"/>
+        <constraint exp="" desc="" field="begin"/>
+        <constraint exp="" desc="" field="end"/>
+        <constraint exp="" desc="" field="Distance"/>
+        <constraint exp="" desc="" field="RouteLen"/>
+        <constraint exp="" desc="" field="Source"/>
+        <constraint exp="" desc="" field="Sort"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="length_km"/>
+        <constraint exp="" desc="" field="length_m"/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" expression="$length * 100" precision="0" comment="" type="6" name="length_km" subType="0" typeName="double precision"/>
-        <field length="-1" expression="$length * 100 * 1000" precision="0" comment="" type="6" name="length_m" subType="0" typeName="double precision"/>
+        <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=""/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="1" sortExpression="&quot;length_m&quot;">
+      <attributetableconfig sortOrder="1" sortExpression="&quot;length_m&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="Name" width="152" hidden="0"/>
-          <column type="field" name="descriptio" width="-1" hidden="0"/>
-          <column type="field" name="timestamp" width="-1" hidden="0"/>
-          <column type="field" name="begin" width="163" hidden="0"/>
-          <column type="field" name="end" width="-1" hidden="0"/>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="field" name="length_m" width="188" hidden="0"/>
-          <column type="field" name="Sort" width="-1" hidden="0"/>
-          <column type="field" name="day" width="-1" hidden="0"/>
-          <column type="field" name="length_km" width="266" hidden="0"/>
+          <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="-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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6521,18 +6514,18 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="Distance" reuseLastValue="0"/>
@@ -6553,7 +6546,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6626,58 +6619,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="196,60,57,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6708,36 +6701,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -6752,44 +6745,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -6812,54 +6805,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="183,72,75,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6890,9 +6883,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6903,9 +6896,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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>
       </customproperties>
       <blendMode>0</blendMode>
@@ -6915,24 +6908,24 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="ID" configurationFlags="None">
+        <field configurationFlags="None" name="ID">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="height" configurationFlags="None">
+        <field configurationFlags="None" name="height">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="elevation" configurationFlags="None">
+        <field configurationFlags="None" name="elevation">
           <editWidget type="">
             <config>
               <Option/>
@@ -6941,30 +6934,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" name="" index="0"/>
-        <alias field="height" name="" index="1"/>
-        <alias field="elevation" name="" index="2"/>
+        <alias index="0" name="" field="ID"/>
+        <alias index="1" name="" field="height"/>
+        <alias index="2" name="" field="elevation"/>
       </aliases>
       <defaults>
-        <default expression="" field="ID" applyOnUpdate="0"/>
-        <default expression="" field="height" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="ID"/>
+        <default applyOnUpdate="0" expression="" field="height"/>
+        <default applyOnUpdate="0" expression="" field="elevation"/>
       </defaults>
       <constraints>
-        <constraint field="ID" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="height" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="elevation" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" desc="" exp=""/>
-        <constraint field="height" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
+        <constraint exp="" desc="" field="ID"/>
+        <constraint exp="" desc="" field="height"/>
+        <constraint exp="" desc="" field="elevation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6987,7 +6980,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Polygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -7062,58 +7055,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="133,182,111,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7144,36 +7137,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -7188,44 +7181,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7248,38 +7241,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -7294,9 +7287,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7307,9 +7300,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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>
       </customproperties>
       <blendMode>0</blendMode>
@@ -7317,35 +7310,35 @@ def my_form_open(dialog, layer, feature):
       <layerOpacity>1</layerOpacity>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="page" configurationFlags="None">
+        <field configurationFlags="None" name="page">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
@@ -7354,34 +7347,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="page" name="" index="2"/>
-        <alias field="day" name="" index="3"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="page"/>
+        <alias index="3" name="" field="day"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="page" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="page" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="page" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="page"/>
+        <constraint exp="" desc="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7404,7 +7397,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -7469,7 +7462,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -7494,58 +7487,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="190,178,151,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7576,36 +7569,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -7620,44 +7613,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7680,54 +7673,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,85,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7758,9 +7751,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7771,32 +7764,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="Name" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -7811,67 +7804,67 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="LineGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <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>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="Name"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -7880,47 +7873,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -7951,9 +7944,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7961,12 +7954,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -7974,17 +7967,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -7993,30 +7986,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="Name" name="" index="1"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="Name"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="Name" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="Name" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="Name"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="Name" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8052,8 +8045,8 @@ def my_form_open(dialog, layer, feature):
         <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="Name"/>
-        <field labelOnTop="0" name="id"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -8061,7 +8054,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8126,7 +8119,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -8151,58 +8144,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,82,45,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8233,36 +8226,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -8277,44 +8270,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8337,48 +8330,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="21KM" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule symbol="1" label="10KM" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule symbol="2" label="5KM" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" symbol="0" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" symbol="1" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" symbol="2" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8398,40 +8391,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="miter"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="210,32,39,255"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0.5"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="area"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -8454,32 +8447,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="100"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8499,44 +8492,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@0@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@0@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -8552,32 +8545,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@0@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@0@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="210,32,39,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -8592,9 +8585,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8602,35 +8595,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="210,32,39,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -8661,39 +8654,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8713,44 +8706,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -8766,32 +8759,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@1@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.5"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -8806,9 +8799,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8816,24 +8809,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="100"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8853,44 +8846,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -8906,32 +8899,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@1@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -8946,9 +8939,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8956,35 +8949,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9015,39 +9008,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9067,44 +9060,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@2@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="69,100,25,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -9120,32 +9113,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@2@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="69,100,25,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="69,100,25,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.5"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -9160,9 +9153,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9170,24 +9163,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="100"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9207,44 +9200,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@2@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="69,100,25,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -9260,32 +9253,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@2@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@2@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="69,100,25,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -9300,9 +9293,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9310,35 +9303,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="69,100,25,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9369,9 +9362,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9383,11 +9376,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -9396,47 +9389,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -9467,9 +9460,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9477,12 +9470,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -9490,52 +9483,52 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="Distance" name="" index="1"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="Distance"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="Distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="id" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="Distance" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9580,17 +9573,17 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -9598,7 +9591,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -9671,58 +9664,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="125,139,143,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9753,36 +9746,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -9797,44 +9790,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -9857,46 +9850,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="marker" alpha="0.796078" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="0.796078" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="227,0,185,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="1"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -9919,15 +9912,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9940,32 +9933,32 @@ def my_form_open(dialog, layer, feature):
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
           <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="8" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -9980,151 +9973,151 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="Priority">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="ZIndex">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="1" priority="8" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
           </rule>
           <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style textColor="227,0,185,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="4" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.10000000000000001" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -10139,89 +10132,89 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="2" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
@@ -10230,145 +10223,145 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="labeling/addDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/angleOffset" value="0"/>
-          <Option type="QString" name="labeling/blendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferBlendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferColorA" value="255"/>
-          <Option type="QString" name="labeling/bufferColorB" value="255"/>
-          <Option type="QString" name="labeling/bufferColorG" value="255"/>
-          <Option type="QString" name="labeling/bufferColorR" value="255"/>
-          <Option type="QString" name="labeling/bufferDraw" value="false"/>
-          <Option type="QString" name="labeling/bufferJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/bufferNoFill" value="false"/>
-          <Option type="QString" name="labeling/bufferSize" value="1"/>
-          <Option type="QString" name="labeling/bufferSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/bufferTransp" value="0"/>
-          <Option type="QString" name="labeling/centroidInside" value="false"/>
-          <Option type="QString" name="labeling/centroidWhole" value="false"/>
-          <Option type="QString" name="labeling/decimals" value="3"/>
-          <Option type="QString" name="labeling/displayAll" value="false"/>
-          <Option type="QString" name="labeling/dist" value="0"/>
-          <Option type="QString" name="labeling/distInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/drawLabels" value="false"/>
-          <Option type="QString" name="labeling/enabled" value="false"/>
-          <Option type="QString" name="labeling/fieldName" value="position"/>
-          <Option type="QString" name="labeling/fitInPolygonOnly" value="false"/>
-          <Option type="QString" name="labeling/fontCapitals" value="0"/>
-          <Option type="QString" name="labeling/fontFamily" value="Myriad Pro"/>
-          <Option type="QString" name="labeling/fontItalic" value="false"/>
-          <Option type="QString" name="labeling/fontLetterSpacing" value="0"/>
-          <Option type="QString" name="labeling/fontLimitPixelSize" value="false"/>
-          <Option type="QString" name="labeling/fontMaxPixelSize" value="10000"/>
-          <Option type="QString" name="labeling/fontMinPixelSize" value="3"/>
-          <Option type="QString" name="labeling/fontSize" value="10"/>
-          <Option type="QString" name="labeling/fontSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/fontStrikeout" value="false"/>
-          <Option type="QString" name="labeling/fontUnderline" value="false"/>
-          <Option type="QString" name="labeling/fontWeight" value="63"/>
-          <Option type="QString" name="labeling/fontWordSpacing" value="0"/>
-          <Option type="QString" name="labeling/formatNumbers" value="false"/>
-          <Option type="QString" name="labeling/isExpression" value="false"/>
-          <Option type="QString" name="labeling/labelOffsetInMapUnits" value="true"/>
-          <Option type="QString" name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/labelPerPart" value="false"/>
-          <Option type="QString" name="labeling/leftDirectionSymbol" value="&lt;"/>
-          <Option type="QString" name="labeling/limitNumLabels" value="false"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleIn" value="20"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleOut" value="-20"/>
-          <Option type="QString" name="labeling/maxNumLabels" value="2000"/>
-          <Option type="QString" name="labeling/mergeLines" value="false"/>
-          <Option type="QString" name="labeling/minFeatureSize" value="0"/>
-          <Option type="QString" name="labeling/multilineAlign" value="0"/>
-          <Option type="QString" name="labeling/multilineHeight" value="1"/>
-          <Option type="QString" name="labeling/namedStyle" value="Semibold"/>
-          <Option type="QString" name="labeling/obstacle" value="true"/>
-          <Option type="QString" name="labeling/obstacleFactor" value="1"/>
-          <Option type="QString" name="labeling/obstacleType" value="0"/>
-          <Option type="QString" name="labeling/offsetType" value="0"/>
-          <Option type="QString" name="labeling/placeDirectionSymbol" value="0"/>
-          <Option type="QString" name="labeling/placement" value="0"/>
-          <Option type="QString" name="labeling/placementFlags" value="10"/>
-          <Option type="QString" name="labeling/plussign" value="false"/>
-          <Option type="QString" name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option type="QString" name="labeling/preserveRotation" value="true"/>
-          <Option type="QString" name="labeling/previewBkgrdColor" value="#ffffff"/>
-          <Option type="QString" name="labeling/priority" value="5"/>
-          <Option type="QString" name="labeling/quadOffset" value="4"/>
-          <Option type="QString" name="labeling/repeatDistance" value="0"/>
-          <Option type="QString" name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/repeatDistanceUnit" value="1"/>
-          <Option type="QString" name="labeling/reverseDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/rightDirectionSymbol" value=">"/>
-          <Option type="QString" name="labeling/scaleMax" value="10000000"/>
-          <Option type="QString" name="labeling/scaleMin" value="1"/>
-          <Option type="QString" name="labeling/scaleVisibility" value="false"/>
-          <Option type="QString" name="labeling/shadowBlendMode" value="6"/>
-          <Option type="QString" name="labeling/shadowColorB" value="0"/>
-          <Option type="QString" name="labeling/shadowColorG" value="0"/>
-          <Option type="QString" name="labeling/shadowColorR" value="0"/>
-          <Option type="QString" name="labeling/shadowDraw" value="false"/>
-          <Option type="QString" name="labeling/shadowOffsetAngle" value="135"/>
-          <Option type="QString" name="labeling/shadowOffsetDist" value="1"/>
-          <Option type="QString" name="labeling/shadowOffsetGlobal" value="true"/>
-          <Option type="QString" name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowRadius" value="1.5"/>
-          <Option type="QString" name="labeling/shadowRadiusAlphaOnly" value="false"/>
-          <Option type="QString" name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowRadiusUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowScale" value="100"/>
-          <Option type="QString" name="labeling/shadowTransparency" value="30"/>
-          <Option type="QString" name="labeling/shadowUnder" value="0"/>
-          <Option type="QString" name="labeling/shapeBlendMode" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeBorderColorB" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorG" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorR" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderWidth" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeDraw" value="true"/>
-          <Option type="QString" name="labeling/shapeFillColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeFillColorB" value="138"/>
-          <Option type="QString" name="labeling/shapeFillColorG" value="0"/>
-          <Option type="QString" name="labeling/shapeFillColorR" value="101"/>
-          <Option type="QString" name="labeling/shapeJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeOffsetX" value="0"/>
-          <Option type="QString" name="labeling/shapeOffsetY" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeRadiiUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeRadiiX" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiY" value="0"/>
-          <Option type="QString" name="labeling/shapeRotation" value="0"/>
-          <Option type="QString" name="labeling/shapeRotationType" value="0"/>
-          <Option type="QString" name="labeling/shapeSVGFile" value=""/>
-          <Option type="QString" name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeSizeType" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeSizeX" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeY" value="0"/>
-          <Option type="QString" name="labeling/shapeTransparency" value="0"/>
-          <Option type="QString" name="labeling/shapeType" value="0"/>
-          <Option type="QString" name="labeling/textColorA" value="255"/>
-          <Option type="QString" name="labeling/textColorB" value="255"/>
-          <Option type="QString" name="labeling/textColorG" value="255"/>
-          <Option type="QString" name="labeling/textColorR" value="255"/>
-          <Option type="QString" name="labeling/textTransp" value="0"/>
-          <Option type="QString" name="labeling/upsidedownLabels" value="0"/>
-          <Option type="QString" name="labeling/wrapChar" value=""/>
-          <Option type="QString" name="labeling/xOffset" value="0"/>
-          <Option type="QString" name="labeling/yOffset" value="0"/>
-          <Option type="QString" name="labeling/zIndex" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -10377,47 +10370,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -10448,9 +10441,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10458,12 +10451,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="10" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="10" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10471,70 +10464,70 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="position" name="" index="1"/>
-        <alias field="type" name="" index="2"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="position"/>
+        <alias index="2" name="" field="type"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="position"/>
+        <constraint exp="" desc="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="position" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10610,7 +10603,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Polygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -10685,58 +10678,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="164,113,88,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10767,36 +10760,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -10811,44 +10804,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10871,38 +10864,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,85,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,85,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="b_diagonal"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,85,0,255"/>
@@ -10917,9 +10910,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10930,11 +10923,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="name"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -10943,47 +10936,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -11014,9 +11007,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11024,12 +11017,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="1" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="1" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -11037,38 +11030,38 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="group" configurationFlags="None">
+        <field configurationFlags="None" name="group">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="cone_len" configurationFlags="None">
+        <field configurationFlags="None" name="cone_len">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="fence_len" configurationFlags="None">
+        <field configurationFlags="None" name="fence_len">
           <editWidget type="">
             <config>
               <Option/>
@@ -11077,45 +11070,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" name="" index="0"/>
-        <alias field="group" name="" index="1"/>
-        <alias field="type" name="" index="2"/>
-        <alias field="cone_len" name="" index="3"/>
-        <alias field="fence_len" name="" index="4"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
       </defaults>
       <constraints>
-        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="group" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="cone_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="fence_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="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="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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="group" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
-        <constraint field="fence_len" desc="" exp=""/>
+        <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"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="group" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="cone_len" width="-1" hidden="0"/>
-          <column type="field" name="fence_len" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="name" hidden="0"/>
+          <column width="-1" type="field" name="group" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11151,8 +11144,8 @@ def my_form_open(dialog, layer, feature):
         <field name="name" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="name"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -11160,7 +11153,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11225,7 +11218,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -11239,26 +11232,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="cone_len" subType="0" typeName="double precision"/>
+        <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=""/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis labelsEnabled="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="3.8.3-Zanzibar" simplifyLocal="1" readOnly="0" simplifyMaxScale="1" minScale="1e+08" maxScale="0" simplifyDrawingHints="1">
+          <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">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 type="RuleRenderer" symbollevels="1" enableorderby="0" forceraster="0">
+            <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" enableorderby="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
               </rules>
               <symbols>
-                <symbol alpha="1" type="line" name="0" clip_to_extent="1" force_rhr="0">
-                  <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+                <symbol type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0">
+                  <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                     <prop k="capstyle" v="square"/>
                     <prop k="customdash" v="5;2"/>
                     <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -11277,9 +11270,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 type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -11290,62 +11283,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style textColor="0,0,0,255" fontUnderline="0" fontCapitals="0" blendMode="0" fieldName="comment" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="11" previewBkgrdColor="#ffffff" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" isExpression="0" textOpacity="0.8" fontStrikeout="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point">
-                      <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferBlendMode="0" bufferOpacity="1" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeBlendMode="0" shapeBorderWidth="0.6" shapeSizeUnit="MM" shapeJoinStyle="128" shapeRadiiX="1" shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="1" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.6" shapeOffsetX="0"/>
-                      <shadow shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0"/>
+                    <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"/>
                       <substitutions/>
                     </text-style>
-                    <text-format leftDirectionSymbol="&lt;" addDirectionSymbol="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                    <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" priority="5" distUnits="MM" dist="5" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" offsetUnits="MM" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" fitInPolygonOnly="0" centroidWhole="0" placement="4" placementFlags="2" xOffset="0" centroidInside="0" rotationAngle="0" geometryGenerator="" geometryGeneratorType="PointGeometry" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                    <rendering displayAll="1" scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                    <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"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                            <Option type="int" name="type" value="2"/>
+                            <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>
                           <Option type="Map" name="PositionY">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                            <Option type="int" name="type" value="2"/>
+                            <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>
                         </Option>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
                 <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style textColor="0,0,0,255" fontUnderline="0" fontCapitals="0" blendMode="0" fieldName="round( $length, 1) || 'm'" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="#ffffff" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" isExpression="1" textOpacity="1" fontStrikeout="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSizeUnit="Point">
-                      <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferBlendMode="0" bufferOpacity="1" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-                      <background shapeType="0" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeUnit="MM" shapeJoinStyle="64" shapeRadiiX="0" shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0"/>
-                      <shadow shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowScale="100" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0"/>
+                    <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"/>
                       <substitutions/>
                     </text-style>
-                    <text-format leftDirectionSymbol="&lt;" addDirectionSymbol="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                    <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" repeatDistanceUnits="MM" geometryGeneratorEnabled="0" priority="5" distUnits="MM" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" offsetUnits="MM" repeatDistance="0" preserveRotation="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" fitInPolygonOnly="0" centroidWhole="0" placement="2" placementFlags="15" xOffset="0" centroidInside="0" rotationAngle="0" geometryGenerator="" geometryGeneratorType="PointGeometry" yOffset="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                    <rendering displayAll="0" scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                    <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"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                            <Option type="int" name="type" value="2"/>
+                            <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>
                           <Option type="Map" name="PositionY">
-                            <Option type="bool" name="active" value="true"/>
-                            <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                            <Option type="int" name="type" value="2"/>
+                            <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>
                         </Option>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -11353,8 +11346,8 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property key="dualview/previewExpressions" value="id"/>
-              <property key="embeddedWidgets/count" value="0"/>
+              <property value="id" key="dualview/previewExpressions"/>
+              <property value="0" key="embeddedWidgets/count"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
@@ -11362,17 +11355,17 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory sizeType="MM" opacity="1" diagramOrientation="Up" backgroundAlpha="255" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" lineSizeType="MM" enabled="0" penAlpha="255" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" rotationOffset="270" minimumSize="0" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" barWidth="5" penWidth="0">
+              <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">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute field="" color="#000000" label=""/>
+                <attribute label="" field="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" dist="0" placement="2">
+            <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" obstacle="0" priority="0">
               <properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
@@ -11460,81 +11453,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" name="" index="0"/>
-              <alias field="group" name="" index="1"/>
-              <alias field="comment" name="" index="2"/>
-              <alias field="moveable" name="" index="3"/>
-              <alias field="type" name="" index="4"/>
-              <alias field="name" name="" index="5"/>
-              <alias field="hidden" name="" index="6"/>
-              <alias field="auxiliary_storage_labeling_positiony" name="" index="7"/>
-              <alias field="auxiliary_storage_labeling_positionx" name="" index="8"/>
-              <alias field="fence_len" name="" index="9"/>
-              <alias field="cone_len" name="" index="10"/>
+              <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"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default expression="" field="id" applyOnUpdate="0"/>
-              <default expression="" field="group" applyOnUpdate="0"/>
-              <default expression="" field="comment" applyOnUpdate="0"/>
-              <default expression="" field="moveable" applyOnUpdate="0"/>
-              <default expression="" field="type" applyOnUpdate="0"/>
-              <default expression="" field="name" applyOnUpdate="0"/>
-              <default expression="" field="hidden" applyOnUpdate="0"/>
-              <default expression="" field="auxiliary_storage_labeling_positiony" applyOnUpdate="0"/>
-              <default expression="" field="auxiliary_storage_labeling_positionx" applyOnUpdate="0"/>
-              <default expression="" field="fence_len" applyOnUpdate="0"/>
-              <default expression="" field="cone_len" applyOnUpdate="0"/>
+              <default applyOnUpdate="0" expression="" field="id"/>
+              <default applyOnUpdate="0" expression="" field="group"/>
+              <default applyOnUpdate="0" expression="" field="comment"/>
+              <default applyOnUpdate="0" expression="" field="moveable"/>
+              <default applyOnUpdate="0" expression="" field="type"/>
+              <default applyOnUpdate="0" expression="" field="name"/>
+              <default applyOnUpdate="0" expression="" field="hidden"/>
+              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
+              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
+              <default applyOnUpdate="0" expression="" field="fence_len"/>
+              <default applyOnUpdate="0" expression="" field="cone_len"/>
             </defaults>
             <constraints>
-              <constraint field="id" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="group" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="comment" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="moveable" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="type" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="name" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="hidden" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positiony" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="auxiliary_storage_labeling_positionx" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="fence_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
-              <constraint field="cone_len" unique_strength="0" exp_strength="0" notnull_strength="0" constraints="0"/>
+              <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"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="id" desc="" exp=""/>
-              <constraint field="group" desc="" exp=""/>
-              <constraint field="comment" desc="" exp=""/>
-              <constraint field="moveable" desc="" exp=""/>
-              <constraint field="type" desc="" exp=""/>
-              <constraint field="name" desc="" exp=""/>
-              <constraint field="hidden" desc="" exp=""/>
-              <constraint field="auxiliary_storage_labeling_positiony" desc="" exp=""/>
-              <constraint field="auxiliary_storage_labeling_positionx" desc="" exp=""/>
-              <constraint field="fence_len" desc="" exp=""/>
-              <constraint field="cone_len" desc="" exp=""/>
+              <constraint exp="" desc="" field="id"/>
+              <constraint exp="" desc="" field="group"/>
+              <constraint exp="" desc="" field="comment"/>
+              <constraint exp="" desc="" field="moveable"/>
+              <constraint exp="" desc="" field="type"/>
+              <constraint exp="" desc="" field="name"/>
+              <constraint exp="" desc="" field="hidden"/>
+              <constraint exp="" desc="" field="auxiliary_storage_labeling_positiony"/>
+              <constraint exp="" desc="" field="auxiliary_storage_labeling_positionx"/>
+              <constraint exp="" desc="" field="fence_len"/>
+              <constraint exp="" desc="" field="cone_len"/>
             </constraintExpressions>
             <expressionfields>
-              <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
-              <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
-              <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="cone_len" subType="0" typeName="double precision"/>
+              <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=""/>
             </expressionfields>
             <attributeactions>
-              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
+            <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
               <columns>
-                <column type="field" name="id" width="-1" hidden="0"/>
-                <column type="field" name="group" width="-1" hidden="0"/>
-                <column type="actions" width="-1" hidden="1"/>
-                <column type="field" name="comment" width="223" hidden="0"/>
-                <column type="field" name="moveable" width="-1" hidden="0"/>
-                <column type="field" name="type" width="-1" hidden="0"/>
-                <column type="field" name="name" width="414" hidden="0"/>
-                <column type="field" name="hidden" width="-1" hidden="0"/>
-                <column type="field" name="fence_len" width="-1" hidden="0"/>
-                <column type="field" name="cone_len" width="-1" hidden="0"/>
-                <column type="field" name="auxiliary_storage_labeling_positiony" width="-1" hidden="1"/>
-                <column type="field" name="auxiliary_storage_labeling_positionx" width="-1" hidden="1"/>
+                <column width="-1" type="field" name="id" hidden="0"/>
+                <column width="-1" type="field" name="group" hidden="0"/>
+                <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"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -11579,18 +11572,18 @@ def my_form_open(dialog, layer, feature):
               <field name="type" editable="1"/>
             </editable>
             <labelOnTop>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-              <field labelOnTop="0" name="comment"/>
-              <field labelOnTop="0" name="cone_len"/>
-              <field labelOnTop="0" name="fence_len"/>
-              <field labelOnTop="0" name="group"/>
-              <field labelOnTop="0" name="hidden"/>
-              <field labelOnTop="0" name="id"/>
-              <field labelOnTop="0" name="length"/>
-              <field labelOnTop="0" name="moveable"/>
-              <field labelOnTop="0" name="name"/>
-              <field labelOnTop="0" name="type"/>
+              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+              <field name="comment" labelOnTop="0"/>
+              <field name="cone_len" labelOnTop="0"/>
+              <field name="fence_len" labelOnTop="0"/>
+              <field name="group" labelOnTop="0"/>
+              <field name="hidden" labelOnTop="0"/>
+              <field name="id" labelOnTop="0"/>
+              <field name="length" labelOnTop="0"/>
+              <field name="moveable" labelOnTop="0"/>
+              <field name="name" labelOnTop="0"/>
+              <field name="type" labelOnTop="0"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -11607,58 +11600,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="133,182,111,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -11689,36 +11682,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -11733,44 +11726,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11793,64 +11786,64 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="1" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" referencescale="-1" enableorderby="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
-            <rule symbol="0" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone')" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-            <rule symbol="1" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-            <rule symbol="2" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-            <rule symbol="3" label="Construction" checkstate="0" filter="regexp_match(&quot;type&quot;, '^constr')" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+          <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>
-          <rule symbol="4" label="Is Visible" checkstate="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+          <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="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="round"/>
-                <Option type="QString" name="customdash" value="1;4"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="Point"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="dot"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -11881,56 +11874,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="round"/>
-                <Option type="QString" name="customdash" value="4;3"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="dash"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -11961,56 +11954,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.8"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12041,56 +12034,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.8"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12121,56 +12114,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12201,50 +12194,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="5" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="5" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="213,180,60,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12275,9 +12268,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12288,32 +12281,32 @@ def my_form_open(dialog, layer, feature):
         <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="comment" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="11" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.80000000000000004" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="0.59999999999999998" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="1" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="255,255,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.6"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12328,110 +12321,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                        <Option type="int" name="type" value="2"/>
+                        <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>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                        <Option type="int" name="type" value="2"/>
+                        <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>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="5" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="5" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1.8200000000000001" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                      <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>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </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}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="round( $length, 1) || 'm'" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="11" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12446,88 +12439,88 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="1"/>
-                        <Option type="int" name="type" value="3"/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="QString" name="expression"/>
+                        <Option value="3" type="int" name="type"/>
                       </Option>
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                        <Option type="int" name="type" value="2"/>
+                        <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>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                        <Option type="int" name="type" value="2"/>
+                        <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>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="6" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="1"/>
-                      <Option type="int" name="type" value="3"/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="QString" name="expression"/>
+                      <Option value="3" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                      <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>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
@@ -12536,11 +12529,11 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -12549,47 +12542,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -12620,9 +12613,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12630,12 +12623,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -12643,66 +12636,66 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="group" configurationFlags="None">
+        <field configurationFlags="None" name="group">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="comment" configurationFlags="None">
+        <field configurationFlags="None" name="comment">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="moveable" configurationFlags="None">
+        <field configurationFlags="None" name="moveable">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="hidden" configurationFlags="None">
+        <field configurationFlags="None" name="hidden">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="fence_len" configurationFlags="None">
+        <field configurationFlags="None" name="fence_len">
           <editWidget type="Hidden">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="cone_len" configurationFlags="None">
+        <field configurationFlags="None" name="cone_len">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -12711,69 +12704,69 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="group" name="" index="1"/>
-        <alias field="comment" name="" index="2"/>
-        <alias field="moveable" name="" index="3"/>
-        <alias field="type" name="" index="4"/>
-        <alias field="name" name="" index="5"/>
-        <alias field="hidden" name="" index="6"/>
-        <alias field="fence_len" name="" index="7"/>
-        <alias field="cone_len" name="" index="8"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="comment" applyOnUpdate="0"/>
-        <default expression="" field="moveable" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="hidden" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="comment"/>
+        <default applyOnUpdate="0" expression="" field="moveable"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="hidden"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="group" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="comment" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="moveable" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="hidden" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="fence_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="cone_len" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="group" desc="" exp=""/>
-        <constraint field="comment" desc="" exp=""/>
-        <constraint field="moveable" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="hidden" desc="" exp=""/>
-        <constraint field="fence_len" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
+        <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"/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="fence_len" subType="0" typeName="double precision"/>
-        <field length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" comment="" type="6" name="cone_len" subType="0" typeName="double precision"/>
+        <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=""/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="group" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="comment" width="373" hidden="0"/>
-          <column type="field" name="moveable" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="name" width="692" hidden="0"/>
-          <column type="field" name="hidden" width="-1" hidden="0"/>
-          <column type="field" name="fence_len" width="-1" hidden="0"/>
-          <column type="field" name="cone_len" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="group" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12819,18 +12812,18 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
-        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
-        <field labelOnTop="0" name="comment"/>
-        <field labelOnTop="0" name="cone_len"/>
-        <field labelOnTop="0" name="fence_len"/>
-        <field labelOnTop="0" name="group"/>
-        <field labelOnTop="0" name="hidden"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="length"/>
-        <field labelOnTop="0" name="moveable"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
+        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
+        <field name="comment" labelOnTop="0"/>
+        <field name="cone_len" labelOnTop="0"/>
+        <field name="fence_len" labelOnTop="0"/>
+        <field name="group" labelOnTop="0"/>
+        <field name="hidden" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="length" labelOnTop="0"/>
+        <field name="moveable" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -12838,7 +12831,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -12911,58 +12904,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="164,113,88,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12993,36 +12986,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -13037,44 +13030,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13097,54 +13090,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,178,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13175,9 +13168,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13188,11 +13181,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="&quot;id&quot;"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -13201,47 +13194,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13272,9 +13265,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13282,12 +13275,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -13295,10 +13288,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -13307,25 +13300,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
+        <alias index="0" name="" field="id"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13360,7 +13353,7 @@ def my_form_open(dialog, layer, feature):
         <field name="id" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
+        <field name="id" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13368,7 +13361,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -13441,58 +13434,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="213,180,60,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13523,36 +13516,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="213,180,60,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="152,129,43,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="213,180,60,255"/>
@@ -13567,44 +13560,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="213,180,60,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="152,129,43,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13627,38 +13620,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="26,0,201,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="dot"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="b_diagonal"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="26,0,201,255"/>
@@ -13673,9 +13666,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13686,20 +13679,20 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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="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 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 value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -13708,47 +13701,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13779,9 +13772,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13789,18 +13782,18 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option type="bool" name="active" value="true"/>
-                <Option type="QString" name="field" value="id"/>
-                <Option type="int" name="type" value="2"/>
+                <Option value="true" type="bool" name="active"/>
+                <Option value="id" type="QString" name="field"/>
+                <Option value="2" type="int" name="type"/>
               </Option>
             </Option>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -13808,40 +13801,40 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="page" configurationFlags="None">
+        <field configurationFlags="None" name="page">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
@@ -13850,40 +13843,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="page" name="" index="2"/>
-        <alias field="day" name="" index="3"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="page"/>
+        <alias index="3" name="" field="day"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="page" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="page" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="page" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="page"/>
+        <constraint exp="" desc="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;page&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;page&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="day" width="-1" hidden="0"/>
-          <column type="field" name="page" width="-1" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13920,9 +13913,9 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="page"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="page" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13930,7 +13923,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -13995,7 +13988,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -14006,7 +13999,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join cascadedDelete="0" joinFieldName="position" memoryCache="0" editable="0" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" upsertOnEdit="0" customPrefix="csv_" hasCustomPrefix="1">
+        <join targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" cascadedDelete="0" memoryCache="0" dynamicForm="0" editable="0" hasCustomPrefix="1" upsertOnEdit="0" customPrefix="csv_">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="club"/>
@@ -14033,58 +14026,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="id" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="id" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="114,155,111,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14115,36 +14108,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="81,111,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -14159,44 +14152,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="81,111,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14219,51 +14212,51 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" label="Show by day in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-          <rule symbol="1" label="Always show in marshal plan" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule symbol="2" label="Show in marshal maps" checkstate="0" 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" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <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}"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="0.8" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="0.8" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="1" enabled="1" locked="0">
+            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="Pixel"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14286,42 +14279,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="0.8" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="1" clip_to_extent="1" alpha="0.8" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="1" enabled="1" locked="0">
+            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="Pixel"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14344,42 +14337,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="0.01" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="2" clip_to_extent="1" alpha="0.01" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="1" enabled="1" locked="0">
+            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="0.1"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14402,9 +14395,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14415,40 +14408,40 @@ def my_form_open(dialog, layer, feature):
         <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}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.10000000000000001" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="231,113,72,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <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>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -14471,34 +14464,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14513,118 +14506,118 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="2" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </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}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.10000000000000001" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="231,113,72,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <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>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -14647,34 +14640,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14689,110 +14682,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="1" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="2" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </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}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.5" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14807,181 +14800,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="FontOpacity">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                       <Option type="Map" name="ZIndex">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                        <Option type="int" name="type" value="3"/>
+                        <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>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="8" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="5" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </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}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="6" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.59999999999999998" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14996,181 +14989,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="FontOpacity">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="8" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="5" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </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}">
             <settings calloutType="simple">
-              <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="position" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="8" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="3" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0.40000000000000002" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,0,255" shapeOpacity="0.90000000000000002" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,0,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,0,255"/>
@@ -15185,149 +15178,149 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                              <Option value="false" type="bool" name="active"/>
+                              <Option value="1" type="int" name="type"/>
+                              <Option value="" type="QString" name="val"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="FontOpacity">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="0" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="0" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="10" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
@@ -15336,153 +15329,153 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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="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 type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="labeling/addDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/angleOffset" value="0"/>
-          <Option type="QString" name="labeling/blendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferBlendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferColorA" value="255"/>
-          <Option type="QString" name="labeling/bufferColorB" value="255"/>
-          <Option type="QString" name="labeling/bufferColorG" value="255"/>
-          <Option type="QString" name="labeling/bufferColorR" value="255"/>
-          <Option type="QString" name="labeling/bufferDraw" value="false"/>
-          <Option type="QString" name="labeling/bufferJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/bufferNoFill" value="false"/>
-          <Option type="QString" name="labeling/bufferSize" value="1"/>
-          <Option type="QString" name="labeling/bufferSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/bufferTransp" value="0"/>
-          <Option type="QString" name="labeling/centroidInside" value="false"/>
-          <Option type="QString" name="labeling/centroidWhole" value="false"/>
-          <Option type="QString" name="labeling/decimals" value="3"/>
-          <Option type="QString" name="labeling/displayAll" value="false"/>
-          <Option type="QString" name="labeling/dist" value="0"/>
-          <Option type="QString" name="labeling/distInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/drawLabels" value="false"/>
-          <Option type="QString" name="labeling/enabled" value="false"/>
-          <Option type="QString" name="labeling/fieldName" value="position"/>
-          <Option type="QString" name="labeling/fitInPolygonOnly" value="false"/>
-          <Option type="QString" name="labeling/fontCapitals" value="0"/>
-          <Option type="QString" name="labeling/fontFamily" value="Myriad Pro"/>
-          <Option type="QString" name="labeling/fontItalic" value="false"/>
-          <Option type="QString" name="labeling/fontLetterSpacing" value="0"/>
-          <Option type="QString" name="labeling/fontLimitPixelSize" value="false"/>
-          <Option type="QString" name="labeling/fontMaxPixelSize" value="10000"/>
-          <Option type="QString" name="labeling/fontMinPixelSize" value="3"/>
-          <Option type="QString" name="labeling/fontSize" value="10"/>
-          <Option type="QString" name="labeling/fontSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/fontStrikeout" value="false"/>
-          <Option type="QString" name="labeling/fontUnderline" value="false"/>
-          <Option type="QString" name="labeling/fontWeight" value="63"/>
-          <Option type="QString" name="labeling/fontWordSpacing" value="0"/>
-          <Option type="QString" name="labeling/formatNumbers" value="false"/>
-          <Option type="QString" name="labeling/isExpression" value="false"/>
-          <Option type="QString" name="labeling/labelOffsetInMapUnits" value="true"/>
-          <Option type="QString" name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/labelPerPart" value="false"/>
-          <Option type="QString" name="labeling/leftDirectionSymbol" value="&lt;"/>
-          <Option type="QString" name="labeling/limitNumLabels" value="false"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleIn" value="20"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleOut" value="-20"/>
-          <Option type="QString" name="labeling/maxNumLabels" value="2000"/>
-          <Option type="QString" name="labeling/mergeLines" value="false"/>
-          <Option type="QString" name="labeling/minFeatureSize" value="0"/>
-          <Option type="QString" name="labeling/multilineAlign" value="0"/>
-          <Option type="QString" name="labeling/multilineHeight" value="1"/>
-          <Option type="QString" name="labeling/namedStyle" value="Semibold"/>
-          <Option type="QString" name="labeling/obstacle" value="true"/>
-          <Option type="QString" name="labeling/obstacleFactor" value="1"/>
-          <Option type="QString" name="labeling/obstacleType" value="0"/>
-          <Option type="QString" name="labeling/offsetType" value="0"/>
-          <Option type="QString" name="labeling/placeDirectionSymbol" value="0"/>
-          <Option type="QString" name="labeling/placement" value="0"/>
-          <Option type="QString" name="labeling/placementFlags" value="10"/>
-          <Option type="QString" name="labeling/plussign" value="false"/>
-          <Option type="QString" name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option type="QString" name="labeling/preserveRotation" value="true"/>
-          <Option type="QString" name="labeling/previewBkgrdColor" value="#ffffff"/>
-          <Option type="QString" name="labeling/priority" value="5"/>
-          <Option type="QString" name="labeling/quadOffset" value="4"/>
-          <Option type="QString" name="labeling/repeatDistance" value="0"/>
-          <Option type="QString" name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/repeatDistanceUnit" value="1"/>
-          <Option type="QString" name="labeling/reverseDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/rightDirectionSymbol" value=">"/>
-          <Option type="QString" name="labeling/scaleMax" value="10000000"/>
-          <Option type="QString" name="labeling/scaleMin" value="1"/>
-          <Option type="QString" name="labeling/scaleVisibility" value="false"/>
-          <Option type="QString" name="labeling/shadowBlendMode" value="6"/>
-          <Option type="QString" name="labeling/shadowColorB" value="0"/>
-          <Option type="QString" name="labeling/shadowColorG" value="0"/>
-          <Option type="QString" name="labeling/shadowColorR" value="0"/>
-          <Option type="QString" name="labeling/shadowDraw" value="false"/>
-          <Option type="QString" name="labeling/shadowOffsetAngle" value="135"/>
-          <Option type="QString" name="labeling/shadowOffsetDist" value="1"/>
-          <Option type="QString" name="labeling/shadowOffsetGlobal" value="true"/>
-          <Option type="QString" name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowRadius" value="1.5"/>
-          <Option type="QString" name="labeling/shadowRadiusAlphaOnly" value="false"/>
-          <Option type="QString" name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowRadiusUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowScale" value="100"/>
-          <Option type="QString" name="labeling/shadowTransparency" value="30"/>
-          <Option type="QString" name="labeling/shadowUnder" value="0"/>
-          <Option type="QString" name="labeling/shapeBlendMode" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeBorderColorB" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorG" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorR" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderWidth" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeDraw" value="true"/>
-          <Option type="QString" name="labeling/shapeFillColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeFillColorB" value="138"/>
-          <Option type="QString" name="labeling/shapeFillColorG" value="0"/>
-          <Option type="QString" name="labeling/shapeFillColorR" value="101"/>
-          <Option type="QString" name="labeling/shapeJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeOffsetX" value="0"/>
-          <Option type="QString" name="labeling/shapeOffsetY" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeRadiiUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeRadiiX" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiY" value="0"/>
-          <Option type="QString" name="labeling/shapeRotation" value="0"/>
-          <Option type="QString" name="labeling/shapeRotationType" value="0"/>
-          <Option type="QString" name="labeling/shapeSVGFile" value=""/>
-          <Option type="QString" name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeSizeType" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeSizeX" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeY" value="0"/>
-          <Option type="QString" name="labeling/shapeTransparency" value="0"/>
-          <Option type="QString" name="labeling/shapeType" value="0"/>
-          <Option type="QString" name="labeling/textColorA" value="255"/>
-          <Option type="QString" name="labeling/textColorB" value="255"/>
-          <Option type="QString" name="labeling/textColorG" value="255"/>
-          <Option type="QString" name="labeling/textColorR" value="255"/>
-          <Option type="QString" name="labeling/textTransp" value="0"/>
-          <Option type="QString" name="labeling/upsidedownLabels" value="0"/>
-          <Option type="QString" name="labeling/wrapChar" value=""/>
-          <Option type="QString" name="labeling/xOffset" value="0"/>
-          <Option type="QString" name="labeling/yOffset" value="0"/>
-          <Option type="QString" name="labeling/zIndex" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -15491,47 +15484,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -15562,9 +15555,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15572,12 +15565,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -15585,119 +15578,119 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" name="IsMultiline" value="false"/>
-                <Option type="bool" name="UseHtml" value="false"/>
+                <Option value="false" type="bool" name="IsMultiline"/>
+                <Option value="false" type="bool" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" name="IsMultiline" value="false"/>
-                <Option type="bool" name="UseHtml" value="false"/>
+                <Option value="false" type="bool" name="IsMultiline"/>
+                <Option value="false" type="bool" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="notes" configurationFlags="None">
+        <field configurationFlags="None" name="notes">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="xyposition" configurationFlags="None">
+        <field configurationFlags="None" name="xyposition">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_position" configurationFlags="None">
+        <field configurationFlags="None" name="csv_position">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_club" configurationFlags="None">
+        <field configurationFlags="None" name="csv_club">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="csv_firstname" configurationFlags="None">
+        <field configurationFlags="None" name="csv_firstname">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_surname" configurationFlags="None">
+        <field configurationFlags="None" name="csv_surname">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_days" configurationFlags="None">
+        <field configurationFlags="None" name="csv_days">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_first_runner" configurationFlags="None">
+        <field configurationFlags="None" name="csv_first_runner">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_last_runner" configurationFlags="None">
+        <field configurationFlags="None" name="csv_last_runner">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_instructions" configurationFlags="None">
+        <field configurationFlags="None" name="csv_instructions">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -15706,90 +15699,90 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="position" name="" index="1"/>
-        <alias field="type" name="" index="2"/>
-        <alias field="notes" name="" index="3"/>
-        <alias field="xyposition" name="" index="4"/>
-        <alias field="day" name="" index="5"/>
-        <alias field="csv_position" name="" index="6"/>
-        <alias field="csv_club" name="" index="7"/>
-        <alias field="csv_firstname" name="" index="8"/>
-        <alias field="csv_surname" name="" index="9"/>
-        <alias field="csv_days" name="" index="10"/>
-        <alias field="csv_first_runner" name="" index="11"/>
-        <alias field="csv_last_runner" name="" index="12"/>
-        <alias field="csv_instructions" name="" index="13"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="notes" applyOnUpdate="0"/>
-        <default expression="" field="xyposition" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="csv_position" applyOnUpdate="0"/>
-        <default expression="" field="csv_club" applyOnUpdate="0"/>
-        <default expression="" field="csv_firstname" applyOnUpdate="0"/>
-        <default expression="" field="csv_surname" applyOnUpdate="0"/>
-        <default expression="" field="csv_days" applyOnUpdate="0"/>
-        <default expression="" field="csv_first_runner" applyOnUpdate="0"/>
-        <default expression="" field="csv_last_runner" applyOnUpdate="0"/>
-        <default expression="" field="csv_instructions" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="notes"/>
+        <default applyOnUpdate="0" expression="" field="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"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="notes" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="xyposition" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_club" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_firstname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_surname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_days" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_first_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_last_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="csv_instructions" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="notes" desc="" exp=""/>
-        <constraint field="xyposition" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="csv_position" desc="" exp=""/>
-        <constraint field="csv_club" desc="" exp=""/>
-        <constraint field="csv_firstname" desc="" exp=""/>
-        <constraint field="csv_surname" desc="" exp=""/>
-        <constraint field="csv_days" desc="" exp=""/>
-        <constraint field="csv_first_runner" desc="" exp=""/>
-        <constraint field="csv_last_runner" desc="" exp=""/>
-        <constraint field="csv_instructions" desc="" exp=""/>
+        <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"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="position" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="notes" width="-1" hidden="0"/>
-          <column type="field" name="xyposition" width="-1" hidden="0"/>
-          <column type="field" name="csv_club" width="-1" hidden="0"/>
-          <column type="field" name="csv_first_runner" width="-1" hidden="0"/>
-          <column type="field" name="csv_last_runner" width="-1" hidden="0"/>
-          <column type="field" name="csv_firstname" width="-1" hidden="0"/>
-          <column type="field" name="csv_surname" width="-1" hidden="0"/>
-          <column type="field" name="csv_position" width="-1" hidden="0"/>
-          <column type="field" name="csv_days" width="-1" hidden="0"/>
-          <column type="field" name="day" width="-1" hidden="0"/>
-          <column type="field" name="csv_instructions" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15857,40 +15850,40 @@ def my_form_open(dialog, layer, feature):
         <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="csv_captain" reuseLastValue="0"/>
@@ -15963,7 +15956,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer geometry="No geometry" type="vector" styleCategories="AllStyleCategories" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" minScale="1e+08" autoRefreshEnabled="0" wkbType="NoGeometry" maxScale="100000" refreshOnNotifyMessage="">
+    <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="">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -16016,7 +16009,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -16029,8 +16022,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="all_routes20170907054841602"/>
         <layer id="marshal_positions20160930121322287"/>
+        <layer id="all_routes20170907054841602"/>
       </dataDependencies>
       <expressionfields/>
       <map-layer-style-manager current="default">
@@ -16044,58 +16037,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="243,166,178,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16126,36 +16119,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="243,166,178,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="174,119,127,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="243,166,178,255"/>
@@ -16170,44 +16163,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="243,166,178,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="174,119,127,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16230,9 +16223,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16241,11 +16234,11 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="first_name"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -16254,129 +16247,129 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="club" configurationFlags="None">
+        <field configurationFlags="None" name="club">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="firstname" configurationFlags="None">
+        <field configurationFlags="None" name="firstname">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="surname" configurationFlags="None">
+        <field configurationFlags="None" name="surname">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="phone" configurationFlags="None">
+        <field configurationFlags="None" name="phone">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="email" configurationFlags="None">
+        <field configurationFlags="None" name="email">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="captain" configurationFlags="None">
+        <field configurationFlags="None" name="captain">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="captain_phone" configurationFlags="None">
+        <field configurationFlags="None" name="captain_phone">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="captain_email" configurationFlags="None">
+        <field configurationFlags="None" name="captain_email">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="days" configurationFlags="None">
+        <field configurationFlags="None" name="days">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="races" configurationFlags="None">
+        <field configurationFlags="None" name="races">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="first_runner" configurationFlags="None">
+        <field configurationFlags="None" name="first_runner">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="last_runner" configurationFlags="None">
+        <field configurationFlags="None" name="last_runner">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="instructions" configurationFlags="None">
+        <field configurationFlags="None" name="instructions">
           <editWidget type="">
             <config>
               <Option/>
@@ -16385,94 +16378,94 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="position" name="" index="0"/>
-        <alias field="club" name="" index="1"/>
-        <alias field="firstname" name="" index="2"/>
-        <alias field="surname" name="" index="3"/>
-        <alias field="name" name="" index="4"/>
-        <alias field="phone" name="" index="5"/>
-        <alias field="email" name="" index="6"/>
-        <alias field="captain" name="" index="7"/>
-        <alias field="captain_phone" name="" index="8"/>
-        <alias field="captain_email" name="" index="9"/>
-        <alias field="days" name="" index="10"/>
-        <alias field="races" name="" index="11"/>
-        <alias field="first_runner" name="" index="12"/>
-        <alias field="last_runner" name="" index="13"/>
-        <alias field="instructions" name="" index="14"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="club" applyOnUpdate="0"/>
-        <default expression="" field="firstname" applyOnUpdate="0"/>
-        <default expression="" field="surname" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="phone" applyOnUpdate="0"/>
-        <default expression="" field="email" applyOnUpdate="0"/>
-        <default expression="" field="captain" applyOnUpdate="0"/>
-        <default expression="" field="captain_phone" applyOnUpdate="0"/>
-        <default expression="" field="captain_email" applyOnUpdate="0"/>
-        <default expression="" field="days" applyOnUpdate="0"/>
-        <default expression="" field="races" applyOnUpdate="0"/>
-        <default expression="" field="first_runner" applyOnUpdate="0"/>
-        <default expression="" field="last_runner" applyOnUpdate="0"/>
-        <default expression="" field="instructions" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="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"/>
       </defaults>
       <constraints>
-        <constraint field="position" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="club" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="firstname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="surname" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="phone" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="email" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="captain" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="captain_phone" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="captain_email" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="days" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="races" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="first_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="last_runner" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="instructions" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="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="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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="club" desc="" exp=""/>
-        <constraint field="firstname" desc="" exp=""/>
-        <constraint field="surname" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="phone" desc="" exp=""/>
-        <constraint field="email" desc="" exp=""/>
-        <constraint field="captain" desc="" exp=""/>
-        <constraint field="captain_phone" desc="" exp=""/>
-        <constraint field="captain_email" desc="" exp=""/>
-        <constraint field="days" desc="" exp=""/>
-        <constraint field="races" desc="" exp=""/>
-        <constraint field="first_runner" desc="" exp=""/>
-        <constraint field="last_runner" desc="" exp=""/>
-        <constraint field="instructions" desc="" exp=""/>
+        <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"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="position" width="-1" hidden="0"/>
-          <column type="field" name="name" width="221" hidden="0"/>
-          <column type="field" name="club" width="-1" hidden="0"/>
-          <column type="field" name="phone" width="-1" hidden="0"/>
-          <column type="field" name="email" width="-1" hidden="0"/>
-          <column type="field" name="captain" width="-1" hidden="0"/>
-          <column type="field" name="races" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="first_runner" width="-1" hidden="0"/>
-          <column type="field" name="last_runner" width="-1" hidden="0"/>
-          <column type="field" name="instructions" width="-1" hidden="0"/>
-          <column type="field" name="firstname" width="-1" hidden="0"/>
-          <column type="field" name="surname" width="-1" hidden="0"/>
-          <column type="field" name="captain_phone" width="-1" hidden="0"/>
-          <column type="field" name="captain_email" width="-1" hidden="0"/>
+          <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="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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16523,23 +16516,23 @@ def my_form_open(dialog, layer, feature):
         <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16547,7 +16540,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -16612,7 +16605,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -16637,58 +16630,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="141,90,153,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16719,36 +16712,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="141,90,153,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="101,64,109,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="141,90,153,255"/>
@@ -16763,44 +16756,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="141,90,153,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="101,64,109,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16823,58 +16816,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="123,211,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16905,50 +16898,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="4;1;1;1"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1.25"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -16979,30 +16972,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -17022,33 +17015,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -17064,32 +17057,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@1@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -17104,9 +17097,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -17119,11 +17112,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -17132,47 +17125,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -17203,9 +17196,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17213,12 +17206,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -17226,17 +17219,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -17245,30 +17238,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17304,8 +17297,8 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17313,7 +17306,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -17378,7 +17371,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -17403,58 +17396,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="232,113,141,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17485,36 +17478,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="232,113,141,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="166,81,101,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="232,113,141,255"/>
@@ -17529,44 +17522,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="232,113,141,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="166,81,101,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -17589,44 +17582,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
+      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="name" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="8.5" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.75" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSize="1.5" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -17641,109 +17634,109 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="LabelRotation">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                    <Option type="int" name="type" value="3"/>
+                    <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>
                   <Option type="Map" name="PositionX">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="field" value="label_x"/>
-                    <Option type="int" name="type" value="2"/>
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="label_x" type="QString" name="field"/>
+                    <Option value="2" type="int" name="type"/>
                   </Option>
                   <Option type="Map" name="PositionY">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="field" value="label_y"/>
-                    <Option type="int" name="type" value="2"/>
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="label_y" type="QString" name="field"/>
+                    <Option value="2" type="int" name="type"/>
                   </Option>
                   <Option type="Map" name="Size">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                    <Option type="int" name="type" value="3"/>
+                    <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>
                 </Option>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="1" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="0.20000000000000001" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="PositionX">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_x"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_x" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_y"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_y" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <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>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="&quot;name&quot;"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -17752,47 +17745,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -17823,9 +17816,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17833,12 +17826,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -17846,160 +17839,160 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="osm_id" configurationFlags="None">
+        <field configurationFlags="None" name="osm_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="z_order" configurationFlags="None">
+        <field configurationFlags="None" name="z_order">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="population" configurationFlags="None">
+        <field configurationFlags="None" name="population">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_x" configurationFlags="None">
+        <field configurationFlags="None" name="label_x">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_y" configurationFlags="None">
+        <field configurationFlags="None" name="label_y">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_rota" configurationFlags="None">
+        <field configurationFlags="None" name="label_rota">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="osm_id" name="" index="1"/>
-        <alias field="name" name="" index="2"/>
-        <alias field="type" name="" index="3"/>
-        <alias field="z_order" name="" index="4"/>
-        <alias field="population" name="" index="5"/>
-        <alias field="label_x" name="" index="6"/>
-        <alias field="label_y" name="" index="7"/>
-        <alias field="label_rota" name="" index="8"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="osm_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="z_order" applyOnUpdate="0"/>
-        <default expression="" field="population" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rota" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="osm_id"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="z_order"/>
+        <default applyOnUpdate="0" expression="" field="population"/>
+        <default applyOnUpdate="0" expression="" field="label_x"/>
+        <default applyOnUpdate="0" expression="" field="label_y"/>
+        <default applyOnUpdate="0" expression="" field="label_rota"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="osm_id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="z_order" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="population" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label_x" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label_y" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label_rota" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="osm_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="z_order" desc="" exp=""/>
-        <constraint field="population" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rota" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="osm_id"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="z_order"/>
+        <constraint exp="" desc="" field="population"/>
+        <constraint exp="" desc="" field="label_x"/>
+        <constraint exp="" desc="" field="label_y"/>
+        <constraint exp="" desc="" field="label_rota"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="osm_id" width="-1" hidden="0"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="field" name="z_order" width="-1" hidden="0"/>
-          <column type="field" name="population" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="label_x" width="-1" hidden="0"/>
-          <column type="field" name="label_y" width="-1" hidden="0"/>
-          <column type="field" name="label_rota" width="-1" hidden="0"/>
+          <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="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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18042,15 +18035,15 @@ def my_form_open(dialog, layer, feature):
         <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -18058,7 +18051,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -18123,7 +18116,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -18148,58 +18141,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,158,23,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18230,36 +18223,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,158,23,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="182,113,16,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,158,23,255"/>
@@ -18274,44 +18267,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="255,158,23,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="182,113,16,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -18334,52 +18327,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
+      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="7" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.80000000000000004" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="196,60,57,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -18402,34 +18395,34 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -18444,116 +18437,116 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="0" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-          <placement repeatDistanceUnits="MapUnit" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="4" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="LineGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="3" priority="3" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="5" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="0.29999999999999999" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="1" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="AlwaysShow">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="always_sho"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="always_sho" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="IsObstacle">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="&quot;&quot;"/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="&quot;&quot;" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="LabelRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="PositionX">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_x"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_x" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_y"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="label_y" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="Priority">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
                 <Option type="Map" name="Show">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="auxiliary_storage_labeling_show"/>
-                  <Option type="int" name="type" value="2"/>
+                  <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>
                 <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <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>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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="List" name="dualview/previewExpressions">
-            <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 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>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -18562,47 +18555,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -18633,9 +18626,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18643,12 +18636,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -18656,124 +18649,124 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="osm_id" configurationFlags="None">
+        <field configurationFlags="None" name="osm_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="highway" configurationFlags="None">
+        <field configurationFlags="None" name="highway">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="waterway" configurationFlags="None">
+        <field configurationFlags="None" name="waterway">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="aerialway" configurationFlags="None">
+        <field configurationFlags="None" name="aerialway">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="barrier" configurationFlags="None">
+        <field configurationFlags="None" name="barrier">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="man_made" configurationFlags="None">
+        <field configurationFlags="None" name="man_made">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="z_order" configurationFlags="None">
+        <field configurationFlags="None" name="z_order">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="other_tags" configurationFlags="None">
+        <field configurationFlags="None" name="other_tags">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="never_show" configurationFlags="None">
+        <field configurationFlags="None" name="never_show">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label_x" configurationFlags="None">
+        <field configurationFlags="None" name="label_x">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label_y" configurationFlags="None">
+        <field configurationFlags="None" name="label_y">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label_rota" configurationFlags="None">
+        <field configurationFlags="None" name="label_rota">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="always_sho" configurationFlags="None">
+        <field configurationFlags="None" name="always_sho">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="resident_a" configurationFlags="None">
+        <field configurationFlags="None" name="resident_a">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="auxiliary_storage_labeling_show" configurationFlags="None">
+        <field configurationFlags="None" name="auxiliary_storage_labeling_show">
           <editWidget type="Hidden">
             <config>
               <Option/>
@@ -18782,100 +18775,100 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" name="" index="0"/>
-        <alias field="name" name="" index="1"/>
-        <alias field="highway" name="" index="2"/>
-        <alias field="waterway" name="" index="3"/>
-        <alias field="aerialway" name="" index="4"/>
-        <alias field="barrier" name="" index="5"/>
-        <alias field="man_made" name="" index="6"/>
-        <alias field="z_order" name="" index="7"/>
-        <alias field="other_tags" name="" index="8"/>
-        <alias field="never_show" name="" index="9"/>
-        <alias field="label_x" name="" index="10"/>
-        <alias field="label_y" name="" index="11"/>
-        <alias field="label_rota" name="" index="12"/>
-        <alias field="always_sho" name="" index="13"/>
-        <alias field="resident_a" name="" index="14"/>
-        <alias field="auxiliary_storage_labeling_show" name="" index="15"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="osm_id" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="highway" applyOnUpdate="0"/>
-        <default expression="" field="waterway" applyOnUpdate="0"/>
-        <default expression="" field="aerialway" applyOnUpdate="0"/>
-        <default expression="" field="barrier" applyOnUpdate="0"/>
-        <default expression="" field="man_made" applyOnUpdate="0"/>
-        <default expression="" field="z_order" applyOnUpdate="0"/>
-        <default expression="" field="other_tags" applyOnUpdate="0"/>
-        <default expression="" field="never_show" applyOnUpdate="0"/>
-        <default expression="" field="label_x" applyOnUpdate="0"/>
-        <default expression="" field="label_y" applyOnUpdate="0"/>
-        <default expression="" field="label_rota" applyOnUpdate="0"/>
-        <default expression="" field="always_sho" applyOnUpdate="0"/>
-        <default expression="" field="resident_a" applyOnUpdate="0"/>
-        <default expression="" field="auxiliary_storage_labeling_show" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="osm_id"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="highway"/>
+        <default applyOnUpdate="0" expression="" field="waterway"/>
+        <default applyOnUpdate="0" expression="" field="aerialway"/>
+        <default applyOnUpdate="0" expression="" field="barrier"/>
+        <default applyOnUpdate="0" expression="" field="man_made"/>
+        <default applyOnUpdate="0" expression="" field="z_order"/>
+        <default applyOnUpdate="0" expression="" field="other_tags"/>
+        <default applyOnUpdate="0" expression="" field="never_show"/>
+        <default applyOnUpdate="0" expression="" field="label_x"/>
+        <default applyOnUpdate="0" expression="" field="label_y"/>
+        <default applyOnUpdate="0" expression="" field="label_rota"/>
+        <default applyOnUpdate="0" expression="" field="always_sho"/>
+        <default applyOnUpdate="0" expression="" field="resident_a"/>
+        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_show"/>
       </defaults>
       <constraints>
-        <constraint field="osm_id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="highway" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="waterway" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="aerialway" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="barrier" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="man_made" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="z_order" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="other_tags" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="never_show" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label_x" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label_y" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label_rota" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="always_sho" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="resident_a" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="auxiliary_storage_labeling_show" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="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="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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="osm_id" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="highway" desc="" exp=""/>
-        <constraint field="waterway" desc="" exp=""/>
-        <constraint field="aerialway" desc="" exp=""/>
-        <constraint field="barrier" desc="" exp=""/>
-        <constraint field="man_made" desc="" exp=""/>
-        <constraint field="z_order" desc="" exp=""/>
-        <constraint field="other_tags" desc="" exp=""/>
-        <constraint field="never_show" desc="" exp=""/>
-        <constraint field="label_x" desc="" exp=""/>
-        <constraint field="label_y" desc="" exp=""/>
-        <constraint field="label_rota" desc="" exp=""/>
-        <constraint field="always_sho" desc="" exp=""/>
-        <constraint field="resident_a" desc="" exp=""/>
-        <constraint field="auxiliary_storage_labeling_show" desc="" exp=""/>
+        <constraint exp="" desc="" field="osm_id"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="highway"/>
+        <constraint exp="" desc="" field="waterway"/>
+        <constraint exp="" desc="" field="aerialway"/>
+        <constraint exp="" desc="" field="barrier"/>
+        <constraint exp="" desc="" field="man_made"/>
+        <constraint exp="" desc="" field="z_order"/>
+        <constraint exp="" desc="" field="other_tags"/>
+        <constraint exp="" desc="" field="never_show"/>
+        <constraint exp="" desc="" field="label_x"/>
+        <constraint exp="" desc="" field="label_y"/>
+        <constraint exp="" desc="" field="label_rota"/>
+        <constraint exp="" desc="" field="always_sho"/>
+        <constraint exp="" desc="" field="resident_a"/>
+        <constraint exp="" desc="" field="auxiliary_storage_labeling_show"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;osm_id&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="osm_id" width="-1" hidden="0"/>
-          <column type="field" name="name" width="160" hidden="0"/>
-          <column type="field" name="z_order" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="highway" width="-1" hidden="0"/>
-          <column type="field" name="waterway" width="-1" hidden="0"/>
-          <column type="field" name="aerialway" width="-1" hidden="0"/>
-          <column type="field" name="barrier" width="-1" hidden="0"/>
-          <column type="field" name="man_made" width="-1" hidden="0"/>
-          <column type="field" name="other_tags" width="142" hidden="0"/>
-          <column type="field" name="never_show" width="-1" hidden="0"/>
-          <column type="field" name="label_x" width="-1" hidden="0"/>
-          <column type="field" name="label_y" width="-1" hidden="0"/>
-          <column type="field" name="label_rota" width="-1" hidden="0"/>
-          <column type="field" name="always_sho" width="-1" hidden="0"/>
-          <column type="field" name="resident_a" width="-1" hidden="0"/>
-          <column type="field" name="auxiliary_storage_labeling_show" width="-1" hidden="0"/>
+          <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="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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18943,40 +18936,40 @@ def my_form_open(dialog, layer, feature):
         <field name="z_order" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="aerialway" reuseLastValue="0"/>
@@ -19044,7 +19037,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -19109,7 +19102,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -19134,58 +19127,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="231,113,72,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -19216,36 +19209,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="231,113,72,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="165,81,51,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="231,113,72,255"/>
@@ -19260,44 +19253,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="231,113,72,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="165,81,51,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -19320,54 +19313,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
+          <rule filter="&quot;type&quot; = 'toilets'" symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
+          <rule filter="&quot;type&quot; = 'togbag'" symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule filter=" &quot;type&quot; = 'closure'" symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule filter="&quot;type&quot; = 'myciti'" symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="name" value="star"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.5"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="7"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -19390,47 +19383,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '7' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="0,32,80,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="amenity/amenity_toilets.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <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 name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="7"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,32,80,255"/>
@@ -19452,47 +19445,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="../images/gym-bag.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <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 name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="6"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -19514,57 +19507,57 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="../images/road_closure.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <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 name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="6"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -19586,47 +19579,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '6' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="0,12,254,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="transport/transport_bus_stop.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="255,255,255,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <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 name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,12,254,255"/>
@@ -19649,18 +19642,18 @@ def my_form_open(dialog, layer, feature):
               <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="13"/>
-                    <Option type="QString" name="blur_level" value="2.645"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="offset_angle" value="135"/>
-                    <Option type="QString" name="offset_distance" value="2"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="opacity" value="1"/>
+                    <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>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -19677,24 +19670,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="0"/>
-                    <Option type="QString" name="blur_level" value="0.7935"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color1" value="0,0,255,255"/>
-                    <Option type="QString" name="color2" value="0,255,0,255"/>
-                    <Option type="QString" name="color_type" value="0"/>
-                    <Option type="QString" name="direction" value="ccw"/>
-                    <Option type="QString" name="discrete" value="0"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="1"/>
-                    <Option type="QString" name="opacity" value="0.5"/>
-                    <Option type="QString" name="rampType" value="gradient"/>
-                    <Option type="QString" name="single_color" value="255,255,255,255"/>
-                    <Option type="QString" name="spec" value="rgb"/>
-                    <Option type="QString" name="spread" value="2"/>
-                    <Option type="QString" name="spread_unit" value="MM"/>
-                    <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <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>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -19717,10 +19710,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="0"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="1"/>
-                    <Option type="QString" name="opacity" value="1"/>
+                    <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>
                   <prop k="blend_mode" v="0"/>
                   <prop k="draw_mode" v="2"/>
@@ -19729,18 +19722,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="13"/>
-                    <Option type="QString" name="blur_level" value="2.645"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="offset_angle" value="135"/>
-                    <Option type="QString" name="offset_distance" value="2"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="opacity" value="1"/>
+                    <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>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -19757,24 +19750,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="0"/>
-                    <Option type="QString" name="blur_level" value="0.7935"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color1" value="0,0,255,255"/>
-                    <Option type="QString" name="color2" value="0,255,0,255"/>
-                    <Option type="QString" name="color_type" value="0"/>
-                    <Option type="QString" name="direction" value="ccw"/>
-                    <Option type="QString" name="discrete" value="0"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="opacity" value="0.5"/>
-                    <Option type="QString" name="rampType" value="gradient"/>
-                    <Option type="QString" name="single_color" value="255,255,255,255"/>
-                    <Option type="QString" name="spec" value="rgb"/>
-                    <Option type="QString" name="spread" value="2"/>
-                    <Option type="QString" name="spread_unit" value="MM"/>
-                    <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <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>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -19798,47 +19791,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="marker" alpha="1" name="5" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="5" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SvgMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="43,153,41,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="transport/amenity=parking.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <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 name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="6"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="color" v="43,153,41,255"/>
@@ -19860,15 +19853,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19877,32 +19870,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="name" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferSize="2" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="2" shapeRadiiY="2" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="1" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="0.69999999999999996" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -19917,99 +19910,99 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="LabelDistance">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                    <Option type="int" name="type" value="3"/>
+                    <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>
                   <Option type="Map" name="OffsetQuad">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="2"/>
-                    <Option type="int" name="type" value="3"/>
+                    <Option value="true" type="bool" name="active"/>
+                    <Option value="2" type="QString" name="expression"/>
+                    <Option value="3" type="int" name="type"/>
                   </Option>
                   <Option type="Map" name="Size">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                    <Option type="int" name="type" value="3"/>
+                    <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>
                 </Option>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="2" geometryGenerator="" lineAnchorType="0" xOffset="2" dist="3" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="3" offsetUnits="MM" placement="0" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="10" obstacleFactor="1.8" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelDistance">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="OffsetQuad">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="2"/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="2" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <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>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -20018,47 +20011,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -20089,9 +20082,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20099,12 +20092,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -20112,31 +20105,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -20145,40 +20138,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="name" name="" index="2"/>
-        <alias field="distance" name="" index="3"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="name"/>
+        <alias index="3" name="" field="distance"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="name"/>
+        <constraint exp="" desc="" field="distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="name" width="-1" hidden="0"/>
-          <column type="field" name="distance" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20216,10 +20209,10 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="distance"/>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="name"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="name" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20227,7 +20220,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -20300,58 +20293,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="152,125,183,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -20382,36 +20375,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="152,125,183,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="109,89,131,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -20426,44 +20419,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="152,125,183,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="109,89,131,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -20486,42 +20479,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="LinePatternFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="LinePatternFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="135"/>
-                <Option type="QString" name="clip_mode" value="during_render"/>
-                <Option type="QString" name="color" value="211,134,33,255"/>
-                <Option type="QString" name="coordinate_reference" value="feature"/>
-                <Option type="QString" name="distance" value="2"/>
-                <Option type="QString" name="distance_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="distance_unit" value="MM"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <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>
               <prop k="angle" v="135"/>
               <prop k="clip_mode" v="during_render"/>
@@ -20540,48 +20533,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="line" alpha="1" name="@0@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="line" name="@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="align_dash_pattern" value="0"/>
-                    <Option type="QString" name="capstyle" value="square"/>
-                    <Option type="QString" name="customdash" value="5;2"/>
-                    <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="customdash_unit" value="MM"/>
-                    <Option type="QString" name="dash_pattern_offset" value="0"/>
-                    <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                    <Option type="QString" name="draw_inside_polygon" value="0"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="line_color" value="211,134,33,255"/>
-                    <Option type="QString" name="line_style" value="solid"/>
-                    <Option type="QString" name="line_width" value="0.3"/>
-                    <Option type="QString" name="line_width_unit" value="MM"/>
-                    <Option type="QString" name="offset" value="0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="ring_filter" value="0"/>
-                    <Option type="QString" name="trim_distance_end" value="0"/>
-                    <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                    <Option type="QString" name="trim_distance_start" value="0"/>
-                    <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                    <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                    <Option type="QString" name="use_custom_dash" value="0"/>
-                    <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <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>
                   <prop k="align_dash_pattern" v="0"/>
                   <prop k="capstyle" v="square"/>
@@ -20612,27 +20605,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 type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="211,134,33,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.46"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="no"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="211,134,33,255"/>
@@ -20647,9 +20640,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20660,11 +20653,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -20673,47 +20666,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -20744,9 +20737,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20754,12 +20747,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="1" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="1" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -20767,10 +20760,10 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="FID" configurationFlags="None">
+        <field configurationFlags="None" name="FID">
           <editWidget type="">
             <config>
               <Option/>
@@ -20779,26 +20772,26 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" name="" index="0"/>
+        <alias index="0" name="" field="FID"/>
       </aliases>
       <defaults>
-        <default expression="" field="FID" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="FID"/>
       </defaults>
       <constraints>
-        <constraint field="FID" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="FID" constraints="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" desc="" exp=""/>
+        <constraint exp="" desc="" field="FID"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="431" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="431" type="field" name="type" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20834,8 +20827,8 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20843,7 +20836,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -20908,7 +20901,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -20933,58 +20926,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="190,207,80,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21015,36 +21008,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="190,207,80,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,148,57,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,207,80,255"/>
@@ -21059,44 +21052,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="190,207,80,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,148,57,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -21119,61 +21112,61 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" label="Road Open" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
-          <rule symbol="1" label="No Parking" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
-          <rule symbol="2" label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
-          <rule symbol="3" label="One-Way" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
-          <rule symbol="4" label="Road Closures" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
+          <rule filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule filter="&quot;status&quot; = 'one-way'" symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,255,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21204,50 +21197,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="2"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -21267,40 +21260,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,255,0,255"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0.5"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="1"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -21323,52 +21316,52 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="2" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="2;1;1;1"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,255,0,255"/>
-                <Option type="QString" name="line_style" value="dash dot dot"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21399,41 +21392,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="25"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -21453,46 +21446,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@2@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@2@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,255,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="35,35,35,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3.5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -21515,58 +21508,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="3" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="3;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,255,0,255"/>
-                <Option type="QString" name="line_style" value="dash"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21597,41 +21590,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="25"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -21651,46 +21644,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@3@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@3@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,255,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="35,35,35,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3.5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -21713,58 +21706,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="4" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21795,20 +21788,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21817,32 +21810,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="times" fontFamily="Myriad Pro" namedStyle="Regular" fontWordSpacing="0" fontItalic="0" fontSize="9" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -21857,67 +21850,67 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="4294967295" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="2" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <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>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -21926,47 +21919,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -21997,9 +21990,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22007,12 +22000,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -22020,31 +22013,31 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="status" configurationFlags="None">
+        <field configurationFlags="None" name="status">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="times" configurationFlags="None">
+        <field configurationFlags="None" name="times">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -22053,40 +22046,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="status" name="" index="2"/>
-        <alias field="times" name="" index="3"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="status"/>
+        <alias index="3" name="" field="times"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
-        <default expression="" field="times" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="status"/>
+        <default applyOnUpdate="0" expression="" field="times"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="status" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="times" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
-        <constraint field="times" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" desc="" field="status"/>
+        <constraint exp="" desc="" field="times"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="type" width="202" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="status" width="-1" hidden="0"/>
-          <column type="field" name="times" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="202" type="field" name="type" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22124,10 +22117,10 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="status"/>
-        <field labelOnTop="0" name="times"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="status" labelOnTop="0"/>
+        <field name="times" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -22135,20 +22128,20 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
-        <xmin>18.37571523317913247</xmin>
+        <xmin>18.37568241336308006</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
-        <ymax>-33.89978292253275782</ymax>
+        <ymax>-33.8998161888264562</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37571523317913247</xmin>
+        <xmin>18.37568241336308006</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
-        <ymax>-33.89978292253275782</ymax>
+        <ymax>-33.8998161888264562</ymax>
       </wgs84extent>
-      <id>route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1</id>
+      <id>route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6</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>
@@ -22208,58 +22201,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="225,89,137,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22290,36 +22283,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="161,64,98,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -22334,44 +22327,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="161,64,98,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22394,54 +22387,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
+      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="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}">
             <settings calloutType="simple">
-              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <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>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -22464,34 +22457,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -22506,138 +22499,138 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                             <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="quadrant" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="rotation" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </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}">
             <settings calloutType="simple">
-              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <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>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -22660,34 +22653,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -22702,98 +22695,98 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                             <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                              <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>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                      <Option value="true" type="bool" name="active"/>
+                      <Option value="quadrant" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="rotation" type="QString" name="field"/>
+                      <Option value="2" type="int" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
@@ -22801,32 +22794,32 @@ def my_form_open(dialog, layer, feature):
           <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}">
               <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <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">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <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">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="210,32,39,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="210,32,39,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <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>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="210,32,39,255"/>
@@ -22841,130 +22834,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <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"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="quadrant" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="rotation" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <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>
                 </callout>
               </settings>
             </rule>
             <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{7539ef8a-1068-4b69-a2cc-c8e9b0369bb7}">
               <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <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">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <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">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="103,34,144,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <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>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="103,34,144,255"/>
@@ -22979,130 +22972,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <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"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="quadrant" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="rotation" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <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>
                 </callout>
               </settings>
             </rule>
             <rule active="0" filter="&quot;Source&quot; = '5KM'" description="5KM" key="{8573f5c5-a6be-456b-8bc8-6817ef1a8c90}">
               <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <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">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <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">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="145,211,55,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="145,211,55,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <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>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="145,211,55,255"/>
@@ -23117,138 +23110,138 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <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"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="1" type="int" name="type"/>
+                          <Option value="" type="QString" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
+                          <Option value="true" type="bool" name="active"/>
+                          <Option value="quadrant" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
+                          <Option value="false" type="bool" name="active"/>
+                          <Option value="rotation" type="QString" name="field"/>
+                          <Option value="2" type="int" name="type"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <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>
                 </callout>
               </settings>
             </rule>
             <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{a7469442-5b53-4ac3-b1ce-1af4427c496f}">
               <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+                <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">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <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">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+                      <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                         <Option type="Map">
-                          <Option type="QString" name="angle" value="0"/>
-                          <Option type="QString" name="cap_style" value="square"/>
-                          <Option type="QString" name="color" value="133,182,111,255"/>
-                          <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                          <Option type="QString" name="joinstyle" value="bevel"/>
-                          <Option type="QString" name="name" value="circle"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="0"/>
-                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="scale_method" value="diameter"/>
-                          <Option type="QString" name="size" value="2"/>
-                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="size_unit" value="MM"/>
-                          <Option type="QString" name="vertical_anchor_point" value="1"/>
+                          <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>
                         <prop k="angle" v="0"/>
                         <prop k="cap_style" v="square"/>
@@ -23271,34 +23264,34 @@ def my_form_open(dialog, layer, feature):
                         <prop k="vertical_anchor_point" v="1"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                    <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="0,72,255,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="0,72,255,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <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>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="0,72,255,255"/>
@@ -23313,77 +23306,77 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                  <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"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="1" type="int" name="type"/>
+                        <Option value="" type="QString" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="true" type="bool" name="active"/>
+                        <Option value="quadrant" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                        <Option value="false" type="bool" name="active"/>
+                        <Option value="rotation" type="QString" name="field"/>
+                        <Option value="2" type="int" name="type"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <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>
                 </callout>
               </settings>
@@ -23393,13 +23386,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
+            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -23408,47 +23401,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -23479,9 +23472,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23489,12 +23482,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -23502,144 +23495,144 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="None">
+        <field configurationFlags="None" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="None">
+        <field configurationFlags="None" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="None">
+        <field configurationFlags="None" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Sort" configurationFlags="None">
+        <field configurationFlags="None" name="Sort">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="length_km" configurationFlags="None">
+        <field configurationFlags="None" name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="org_fid" configurationFlags="None">
+        <field configurationFlags="None" name="org_fid">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="quadrant" configurationFlags="None">
+        <field configurationFlags="None" name="quadrant">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -23648,95 +23641,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="Distance" name="" index="5"/>
-        <alias field="RouteLen" name="" index="6"/>
-        <alias field="Source" name="" index="7"/>
-        <alias field="Sort" name="" index="8"/>
-        <alias field="day" name="" index="9"/>
-        <alias field="length_km" name="" index="10"/>
-        <alias field="length_m" name="" index="11"/>
-        <alias field="org_fid" name="" index="12"/>
-        <alias field="distance" name="" index="13"/>
-        <alias field="quadrant" name="" index="14"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="quadrant" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="Sort"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="org_fid"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="quadrant"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Sort" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="org_fid" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="quadrant" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="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="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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="Sort" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
-        <constraint field="org_fid" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="quadrant" desc="" exp=""/>
+        <constraint exp="" desc="" field="Name"/>
+        <constraint exp="" desc="" field="descriptio"/>
+        <constraint exp="" desc="" field="timestamp"/>
+        <constraint exp="" desc="" field="begin"/>
+        <constraint exp="" desc="" field="end"/>
+        <constraint exp="" desc="" field="Distance"/>
+        <constraint exp="" desc="" field="RouteLen"/>
+        <constraint exp="" desc="" field="Source"/>
+        <constraint exp="" desc="" field="Sort"/>
+        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" desc="" field="length_km"/>
+        <constraint exp="" desc="" field="length_m"/>
+        <constraint exp="" desc="" field="org_fid"/>
+        <constraint exp="" desc="" field="distance"/>
+        <constraint exp="" desc="" field="quadrant"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="org_fid" width="-1" hidden="0"/>
-          <column type="field" name="distance" width="-1" hidden="0"/>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="descriptio" width="-1" hidden="0"/>
-          <column type="field" name="timestamp" width="-1" hidden="0"/>
-          <column type="field" name="begin" width="-1" hidden="0"/>
-          <column type="field" name="end" width="-1" hidden="0"/>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="field" name="length_km" width="-1" hidden="0"/>
-          <column type="field" name="Sort" width="-1" hidden="0"/>
-          <column type="field" name="quadrant" width="-1" hidden="0"/>
-          <column type="field" name="day" width="-1" hidden="0"/>
-          <column type="field" name="length_m" width="-1" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23785,21 +23778,21 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <field name="Distance" labelOnTop="0"/>
+        <field name="Name" labelOnTop="0"/>
+        <field name="RouteLen" labelOnTop="0"/>
+        <field name="Sort" labelOnTop="0"/>
+        <field name="Source" labelOnTop="0"/>
+        <field name="begin" labelOnTop="0"/>
+        <field name="day" labelOnTop="0"/>
+        <field name="descriptio" labelOnTop="0"/>
+        <field name="distance" labelOnTop="0"/>
+        <field name="end" labelOnTop="0"/>
+        <field name="length_km" labelOnTop="0"/>
+        <field name="length_m" labelOnTop="0"/>
+        <field name="org_fid" labelOnTop="0"/>
+        <field name="quadrant" labelOnTop="0"/>
+        <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
         <field name="Distance" reuseLastValue="0"/>
@@ -23823,1695 +23816,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
-      <extent>
-        <xmin>18.37543911768802474</xmin>
-        <ymin>-33.95582126985814853</ymin>
-        <xmax>18.42275999405387665</xmax>
-        <ymax>-33.90013265894425842</ymax>
-      </extent>
-      <wgs84extent>
-        <xmin>18.37543911768802474</xmin>
-        <ymin>-33.95582126985814853</ymin>
-        <xmax>18.42275999405387665</xmax>
-        <ymax>-33.90013265894425842</ymax>
-      </wgs84extent>
-      <id>route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7</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_m:integer(6,0)&amp;field=length_km: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>
-      </keywordList>
-      <layername>route_markers</layername>
-      <srs>
-        <spatialrefsys nativeFormat="Wkt">
-          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent/>
-      </resourceMetadata>
-      <provider encoding="">memory</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <metadataUrls/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-        <Private>0</Private>
-      </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
-        <fixedRange>
-          <start></start>
-          <end></end>
-        </fixedRange>
-      </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
-        <data-defined-properties>
-          <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
-          </Option>
-        </data-defined-properties>
-        <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-              <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="225,89,137,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="align_dash_pattern" v="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"/>
-              <prop k="customdash_unit" v="MM"/>
-              <prop k="dash_pattern_offset" v="0"/>
-              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="dash_pattern_offset_unit" v="MM"/>
-              <prop k="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="225,89,137,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.6"/>
-              <prop k="line_width_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="trim_distance_end" v="0"/>
-              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_end_unit" v="MM"/>
-              <prop k="trim_distance_start" v="0"/>
-              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_start_unit" v="MM"/>
-              <prop k="tweak_dash_pattern_on_corners" v="0"/>
-              <prop k="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileLineSymbol>
-        <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-              <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="161,64,98,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
-              </Option>
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="225,89,137,255"/>
-              <prop k="joinstyle" v="bevel"/>
-              <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="161,64,98,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileFillSymbol>
-        <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-              <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="161,64,98,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
-              </Option>
-              <prop k="angle" v="0"/>
-              <prop k="cap_style" v="square"/>
-              <prop k="color" v="225,89,137,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="diamond"/>
-              <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="161,64,98,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.2"/>
-              <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="3"/>
-              <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" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileMarkerSymbol>
-      </elevation>
-      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" 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}">
-            <settings calloutType="simple">
-              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
-                <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
-                        <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-                      <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
-                      </Option>
-                      <prop k="angle" v="0"/>
-                      <prop k="cap_style" v="square"/>
-                      <prop k="color" v="213,180,60,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" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
-                        <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                      <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
-                      </Option>
-                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="color" v="0,0,0,255"/>
-                      <prop k="joinstyle" v="round"/>
-                      <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="0,0,0,255"/>
-                      <prop k="outline_style" v="solid"/>
-                      <prop k="outline_width" v="1"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
-                            </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
-                            </Option>
-                          </Option>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
-                </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}">
-            <settings calloutType="simple">
-              <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
-                <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetX="0">
-                  <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
-                        <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-                      <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
-                      </Option>
-                      <prop k="angle" v="0"/>
-                      <prop k="cap_style" v="square"/>
-                      <prop k="color" v="213,180,60,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" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
-                        <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                      <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
-                      </Option>
-                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="color" v="0,0,0,255"/>
-                      <prop k="joinstyle" v="round"/>
-                      <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="0,0,0,255"/>
-                      <prop k="outline_style" v="solid"/>
-                      <prop k="outline_width" v="1"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
-                            </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
-                            </Option>
-                          </Option>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
-                    </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
-                    </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
-                </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}">
-              <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
-                  <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                        <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="210,32,39,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="210,32,39,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="210,32,39,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <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="210,32,39,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
-                            <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
-                        </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
-                        </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
-                        </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="3" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{7539ef8a-1068-4b69-a2cc-c8e9b0369bb7}">
-              <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
-                  <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                        <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="103,34,144,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="103,34,144,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <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="103,34,144,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
-                            <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
-                        </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
-                        </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
-                        </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = '5KM'" description="5KM" key="{8573f5c5-a6be-456b-8bc8-6817ef1a8c90}">
-              <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
-                  <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="128" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                        <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="145,211,55,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="145,211,55,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="145,211,55,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <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="145,211,55,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
-                            <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
-                        </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
-                        </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
-                        </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{a7469442-5b53-4ac3-b1ce-1af4427c496f}">
-              <settings calloutType="simple">
-                <text-style textColor="255,255,255,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="1" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
-                  <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferJoinStyle="64" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                  <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiY="1" shapeBorderWidth="1" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetX="0">
-                    <symbol type="marker" alpha="1" name="markerSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-                        <Option type="Map">
-                          <Option type="QString" name="angle" value="0"/>
-                          <Option type="QString" name="cap_style" value="square"/>
-                          <Option type="QString" name="color" value="133,182,111,255"/>
-                          <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                          <Option type="QString" name="joinstyle" value="bevel"/>
-                          <Option type="QString" name="name" value="circle"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="0"/>
-                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="scale_method" value="diameter"/>
-                          <Option type="QString" name="size" value="2"/>
-                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="size_unit" value="MM"/>
-                          <Option type="QString" name="vertical_anchor_point" value="1"/>
-                        </Option>
-                        <prop k="angle" v="0"/>
-                        <prop k="cap_style" v="square"/>
-                        <prop k="color" v="133,182,111,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" name="name" value=""/>
-                            <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                        <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="0,72,255,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="0,72,255,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="0,72,255,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <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="0,72,255,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
-                            <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="0" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-                <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="1" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="2" offsetType="0" layerType="PointGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="6" priority="10" distUnits="MM" overlapHandling="AllowOverlapIfRequired" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-                <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="2" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
-                      </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-          </rule>
-        </rules>
-      </labeling>
-      <customproperties>
-        <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
-          </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
-        </Option>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="100000" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
-          <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                </Option>
-                <prop k="align_dash_pattern" v="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"/>
-                <prop k="customdash_unit" v="MM"/>
-                <prop k="dash_pattern_offset" v="0"/>
-                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="dash_pattern_offset_unit" v="MM"/>
-                <prop k="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="35,35,35,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0.26"/>
-                <prop k="line_width_unit" v="MM"/>
-                <prop k="offset" v="0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="ring_filter" v="0"/>
-                <prop k="trim_distance_end" v="0"/>
-                <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_end_unit" v="MM"/>
-                <prop k="trim_distance_start" v="0"/>
-                <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_start_unit" v="MM"/>
-                <prop k="tweak_dash_pattern_on_corners" v="0"/>
-                <prop k="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </axisSymbol>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
-        <properties>
-          <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
-      <referencedLayers/>
-      <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="descriptio" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="timestamp" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="begin" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="end" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="RouteLen" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Source" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Sort" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="day" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_m" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_km" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="org_fid" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="quadrant" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
-      <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="Distance" name="" index="5"/>
-        <alias field="RouteLen" name="" index="6"/>
-        <alias field="Source" name="" index="7"/>
-        <alias field="Sort" name="" index="8"/>
-        <alias field="day" name="" index="9"/>
-        <alias field="length_m" name="" index="10"/>
-        <alias field="length_km" name="" index="11"/>
-        <alias field="org_fid" name="" index="12"/>
-        <alias field="distance" name="" index="13"/>
-        <alias field="quadrant" name="" index="14"/>
-      </aliases>
-      <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="quadrant" applyOnUpdate="0"/>
-      </defaults>
-      <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Sort" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="day" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="org_fid" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="quadrant" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="Sort" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="org_fid" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="quadrant" desc="" exp=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-      </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
-        <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="org_fid" width="-1" hidden="0"/>
-          <column type="field" name="distance" width="-1" hidden="0"/>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="descriptio" width="-1" hidden="0"/>
-          <column type="field" name="timestamp" width="-1" hidden="0"/>
-          <column type="field" name="begin" width="-1" hidden="0"/>
-          <column type="field" name="end" width="-1" hidden="0"/>
-          <column type="field" name="Distance" width="-1" hidden="0"/>
-          <column type="field" name="length_km" width="-1" hidden="0"/>
-          <column type="field" name="Sort" width="-1" hidden="0"/>
-          <column type="field" name="quadrant" width="-1" hidden="0"/>
-          <column type="field" name="day" width="-1" hidden="0"/>
-          <column type="field" name="length_m" width="-1" hidden="0"/>
-        </columns>
-      </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <storedexpressions/>
-      <editform tolerant="1"></editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Sort" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="quadrant" editable="1"/>
-        <field name="timestamp" editable="1"/>
-      </editable>
-      <labelOnTop>
-        <field 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"/>
-      </reuseLastValue>
-      <dataDefinedFieldProperties/>
-      <widgets/>
-      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip>Text</mapTip>
-    </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -25584,58 +23889,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="229,182,54,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -25666,36 +23971,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -25710,44 +24015,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -25770,38 +24075,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
         <symbols>
-          <symbol type="fill" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -25816,9 +24121,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25829,10 +24134,10 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="&quot;id&quot;"/>
+          <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>
       </customproperties>
       <blendMode>0</blendMode>
@@ -25840,28 +24145,28 @@ def my_form_open(dialog, layer, feature):
       <layerOpacity>1</layerOpacity>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="area" configurationFlags="None">
+        <field configurationFlags="None" name="area">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="rotation" configurationFlags="None">
+        <field configurationFlags="None" name="rotation">
           <editWidget type="">
             <config>
               <Option/>
@@ -25870,35 +24175,35 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="area" name="" index="1"/>
-        <alias field="rotation" name="" index="2"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="area"/>
+        <alias index="2" name="" field="rotation"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="area" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="area"/>
+        <default applyOnUpdate="0" expression="" field="rotation"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="area" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="rotation" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="area" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="area"/>
+        <constraint exp="" desc="" field="rotation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="area" width="-1" hidden="0"/>
-          <column type="field" name="rotation" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <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="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25921,7 +24226,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -25986,7 +24291,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -26011,58 +24316,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="196,60,57,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -26093,36 +24398,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -26137,44 +24442,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -26197,49 +24502,49 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
           <rule symbol="0" label="All distances" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol type="marker" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="1">
+            <layer locked="1" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,0"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="0.5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -26262,20 +24567,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                      <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>
                     <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                      <Option value="false" type="bool" name="active"/>
+                      <Option value="1" type="int" name="type"/>
+                      <Option value="" type="QString" name="val"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26287,15 +24592,15 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <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="StringList" name="dualview/previewExpressions">
-            <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 value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -26304,47 +24609,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26375,9 +24680,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26385,12 +24690,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -26398,103 +24703,103 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
+        <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="length_km" configurationFlags="None">
+        <field configurationFlags="None" name="length_km">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="org_fid" configurationFlags="None">
+        <field configurationFlags="None" name="org_fid">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="first_runn" configurationFlags="None">
+        <field configurationFlags="None" name="first_runn">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="last_runne" configurationFlags="None">
+        <field configurationFlags="None" name="last_runne">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -26503,85 +24808,85 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="RouteLen" name="" index="5"/>
-        <alias field="Source" name="" index="6"/>
-        <alias field="length_m" name="" index="7"/>
-        <alias field="length_km" name="" index="8"/>
-        <alias field="org_fid" name="" index="9"/>
-        <alias field="distance" name="" index="10"/>
-        <alias field="first_runn" name="" index="11"/>
-        <alias field="last_runne" name="" index="12"/>
+        <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"/>
       </aliases>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="first_runn" applyOnUpdate="0"/>
-        <default expression="" field="last_runne" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="org_fid"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="first_runn"/>
+        <default applyOnUpdate="0" expression="" field="last_runne"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="begin" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="end" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="Source" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_m" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="length_km" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="org_fid" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="distance" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="first_runn" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="last_runne" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="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="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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" desc="" exp=""/>
-        <constraint field="descriptio" desc="" exp=""/>
-        <constraint field="timestamp" desc="" exp=""/>
-        <constraint field="begin" desc="" exp=""/>
-        <constraint field="end" desc="" exp=""/>
-        <constraint field="RouteLen" desc="" exp=""/>
-        <constraint field="Source" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
-        <constraint field="length_km" desc="" exp=""/>
-        <constraint field="org_fid" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="first_runn" desc="" exp=""/>
-        <constraint field="last_runne" desc="" exp=""/>
+        <constraint exp="" desc="" field="Name"/>
+        <constraint exp="" desc="" field="descriptio"/>
+        <constraint exp="" desc="" field="timestamp"/>
+        <constraint exp="" desc="" field="begin"/>
+        <constraint exp="" desc="" field="end"/>
+        <constraint exp="" desc="" field="RouteLen"/>
+        <constraint exp="" desc="" field="Source"/>
+        <constraint exp="" desc="" field="length_m"/>
+        <constraint exp="" desc="" field="length_km"/>
+        <constraint exp="" desc="" field="org_fid"/>
+        <constraint exp="" desc="" field="distance"/>
+        <constraint exp="" desc="" field="first_runn"/>
+        <constraint exp="" desc="" field="last_runne"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;first_runn&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="begin" width="179" hidden="0"/>
-          <column type="field" name="RouteLen" width="-1" hidden="0"/>
-          <column type="field" name="Source" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="Name" width="-1" hidden="0"/>
-          <column type="field" name="length_m" width="-1" hidden="0"/>
-          <column type="field" name="length_km" width="-1" hidden="0"/>
-          <column type="field" name="org_fid" width="-1" hidden="0"/>
-          <column type="field" name="first_runn" width="-1" hidden="0"/>
-          <column type="field" name="last_runne" width="-1" hidden="0"/>
-          <column type="field" name="descriptio" width="-1" hidden="0"/>
-          <column type="field" name="timestamp" width="-1" hidden="0"/>
-          <column type="field" name="end" width="-1" hidden="0"/>
-          <column type="field" name="distance" width="-1" hidden="0"/>
+          <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="-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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26640,31 +24945,31 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
-        <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"/>
+        <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"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -26672,7 +24977,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiLineString" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Line" simplifyAlgorithm="0" labelsEnabled="0">
+    <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">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -26745,58 +25050,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="190,178,151,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -26827,36 +25132,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -26871,44 +25176,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -26931,58 +25236,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0">
+      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol type="line" alpha="1" name="0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="123,211,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -27013,50 +25318,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol type="line" alpha="1" name="1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="4;1;1;1"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1.25"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -27087,30 +25392,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer class="MarkerLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <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>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -27130,33 +25435,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol type="marker" alpha="1" name="@1@1" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+              <symbol is_animated="0" type="marker" name="@1@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="FilledMarker" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <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>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -27172,32 +25477,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol type="fill" alpha="1" name="@@1@1@0" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                  <symbol is_animated="0" type="fill" name="@@1@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -27212,9 +25517,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -27227,11 +25532,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -27240,47 +25545,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -27311,9 +25616,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27321,12 +25626,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="2" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -27334,17 +25639,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -27353,30 +25658,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="type" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="type" width="-1" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" type="field" name="type" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27412,8 +25717,8 @@ def my_form_open(dialog, layer, feature):
         <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="type"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -27421,7 +25726,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="0" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="Point" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Point" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -27494,58 +25799,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,82,45,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -27576,36 +25881,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -27620,44 +25925,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -27680,44 +25985,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
+      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="label" fontFamily="Myriad Pro" namedStyle="Semibold" fontWordSpacing="0" fontItalic="0" fontSize="15" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="1" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -27732,66 +26037,66 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="3" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-          <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="4" geometryGenerator="" lineAnchorType="0" xOffset="0" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MM" placement="0" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="0" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <rendering scaleMax="0" scaleMin="0" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="0" obstacleFactor="1" maxNumLabels="2000" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <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>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -27800,47 +26105,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -27871,9 +26176,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27881,12 +26186,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="18" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -27894,17 +26199,17 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="label" configurationFlags="None">
+        <field configurationFlags="None" name="label">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -27913,30 +26218,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="label" name="" index="1"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="label"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="label"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="field" name="label" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" name="label" hidden="0"/>
+          <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27972,8 +26277,8 @@ def my_form_open(dialog, layer, feature):
         <field name="label" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -27981,7 +26286,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingHints="1" symbologyReferenceScale="-1" type="vector" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" minScale="100000000" simplifyLocal="1" wkbType="MultiPolygon" refreshOnNotifyMessage="" simplifyMaxScale="1" legendPlaceholderImage="" readOnly="0" simplifyDrawingTol="1" autoRefreshTime="0" styleCategories="AllStyleCategories" geometry="Polygon" simplifyAlgorithm="0" labelsEnabled="1">
+    <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">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -28046,7 +26351,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" crs="" miny="0" dimensions="2" minx="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
           <temporal>
             <period>
               <start></start>
@@ -28071,58 +26376,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" startExpression="" durationUnit="min" mode="0" durationField="" endExpression="" enabled="0" startField="" accumulate="0" endField="" fixedDuration="0">
+      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" type="IndividualFeatures" binding="Centroid" respectLayerSymbol="1" extrusion="0" extrusionEnabled="0" zoffset="0" zscale="1" symbology="Line" showMarkerSymbolInSurfacePlots="0">
+      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="125,139,143,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28153,36 +26458,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -28197,44 +26502,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <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>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -28257,46 +26562,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0" forceraster="0"/>
+      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="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}">
             <settings calloutType="simple">
-              <text-style textColor="31,120,180,255" fontUnderline="0" allowHtml="0" blendMode="0" fieldName="label" fontFamily="Myriad Pro" namedStyle="Bold" fontWordSpacing="0" fontItalic="0" fontSize="8" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="75" fontLetterSpacing="0" useSubstitutions="0" fontKerning="1" textOpacity="0.90000000000000002" capitalization="0" isExpression="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point" legendString="Aa">
+              <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">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferSize="0.75" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferColor="255,255,255,255"/>
-                <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0.5" shapeRadiiY="0.5" shapeBorderWidth="0.75" shapeJoinStyle="128" shapeOffsetY="-0.14999999999999999" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeSizeType="0" shapeSizeY="0.29999999999999999" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeFillColor="255,255,255,204" shapeOpacity="0.59999999999999998" shapeOffsetX="0">
-                  <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+                <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">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,204"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="31,120,206,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.75"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,204"/>
@@ -28311,56 +26616,56 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+                <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"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0" reverseDirectionSymbol="0" multilineAlign="1" rightDirectionSymbol=">" decimals="3" placeDirectionSymbol="0" wrapChar="" autoWrapLength="0" plussign="0"/>
-              <placement repeatDistanceUnits="MM" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationUnit="AngleDegrees" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" fitInPolygonOnly="0" allowDegraded="0" geometryGeneratorType="PointGeometry" centroidInside="0" repeatDistance="0" geometryGeneratorEnabled="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" quadOffset="1" geometryGenerator="" lineAnchorType="0" xOffset="1" dist="0" offsetType="0" layerType="UnknownGeometry" polygonPlacementFlags="2" yOffset="0" offsetUnits="MapUnit" placement="0" priority="5" distUnits="MM" overlapHandling="PreventOverlap" rotationAngle="0" centroidWhole="1" overrunDistance="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
-              <rendering scaleMax="10000000" scaleMin="1" obstacle="1" minFeatureSize="0" labelPerPart="0" obstacleType="0" fontLimitPixelSize="0" fontMinPixelSize="3" zIndex="5" obstacleFactor="0.76000000000000001" maxNumLabels="6" fontMaxPixelSize="10000" mergeLines="0" drawLabels="1" unplacedVisibility="0" scaleVisibility="0" limitNumLabels="0" upsidedownLabels="0"/>
+              <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"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; alpha=&quot;1&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; enabled=&quot;1&quot; locked=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&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; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <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>
               </callout>
             </settings>
@@ -28369,11 +26674,11 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
+          <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="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -28382,47 +26687,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory sizeType="MM" opacity="1" backgroundAlpha="255" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" penColor="#000000" enabled="0" lineSizeType="MM" penAlpha="255" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" spacing="0" rotationOffset="270" showAxis="0" minimumSize="0" spacingUnit="MM" minScaleDenominator="0" height="15" width="15" backgroundColor="#ffffff" spacingUnitScale="3x:0,0,0,0,0,0" barWidth="5" direction="1" penWidth="0">
-          <fontProperties style="" italic="0" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
-          <attribute field="" color="#000000" label="" colorOpacity="1"/>
+        <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"/>
           <axisSymbol>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -28453,9 +26758,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -28463,12 +26768,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" obstacle="0" showAll="1" linePlacementFlags="2" zIndex="0" placement="0" dist="0">
+      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -28476,40 +26781,40 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_set" configurationFlags="None">
+        <field configurationFlags="None" name="table_set">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label" configurationFlags="None">
+        <field configurationFlags="None" name="label">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="races" configurationFlags="None">
+        <field configurationFlags="None" name="races">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -28518,40 +26823,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="table_set" name="" index="1"/>
-        <alias field="label" name="" index="2"/>
-        <alias field="races" name="" index="3"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="table_set"/>
+        <alias index="2" name="" field="label"/>
+        <alias index="3" name="" field="races"/>
       </aliases>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="table_set" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
-        <default expression="" field="races" applyOnUpdate="0"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="table_set"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
+        <default applyOnUpdate="0" expression="" field="races"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="table_set" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="label" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
-        <constraint field="races" unique_strength="0" exp_strength="0" constraints="0" notnull_strength="0"/>
+        <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"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="table_set" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
-        <constraint field="races" desc="" exp=""/>
+        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" desc="" field="table_set"/>
+        <constraint exp="" desc="" field="label"/>
+        <constraint exp="" desc="" field="races"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" name="table_set" width="-1" hidden="0"/>
-          <column type="field" name="label" width="-1" hidden="0"/>
-          <column type="field" name="races" width="130" hidden="0"/>
+          <column width="-1" type="field" name="id" hidden="0"/>
+          <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"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28589,10 +26894,10 @@ def my_form_open(dialog, layer, feature):
         <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
-        <field labelOnTop="0" name="id"/>
-        <field labelOnTop="0" name="label"/>
-        <field labelOnTop="0" name="races"/>
-        <field labelOnTop="0" name="table_set"/>
+        <field name="id" labelOnTop="0"/>
+        <field name="label" labelOnTop="0"/>
+        <field name="races" labelOnTop="0"/>
+        <field name="table_set" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -28626,8 +26931,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_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
-    <layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
+    <layer id="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -28958,348 +27262,269 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option type="QString" name="name" value=""/>
+      <Option value="" type="QString" name="name"/>
       <Option name="properties"/>
-      <Option type="QString" name="type" value="collection"/>
+      <Option value="collection" type="QString" name="type"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" style="default" expanded="1"/>
+    <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"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="0"/>
+      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <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="Routes/Markers"/>
+        <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="Elevation"/>
-        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="All Routes" has-expanded-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default" expanded="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" 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="water_tables20170921142016467" visible="0" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" style="default" expanded="1"/>
-      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" style="default" expanded="1"/>
-      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="OSM data"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Marshals"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" style="default" expanded="1"/>
+    <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"/>
       <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"/>
+      <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"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Ask Me"/>
+        <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="Ask Me"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-expanded-info="1">
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="1"/>
+    <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 id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing" expanded="1"/>
+      <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="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="water_tables20170921142016467" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
+      <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="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
+        <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-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+    <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 id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
+      <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"/>
       <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"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
+        <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-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="1"/>
+    <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"/>
+      <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"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing" expanded="1"/>
+      <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="{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-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
+      <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="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
         <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"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
+        <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-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal overview" has-expanded-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default" expanded="1"/>
+    <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"/>
       <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 id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing" expanded="1"/>
+      <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"/>
+      <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"/>
+      <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"/>
+      <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"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
         <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-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="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
+      <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="water_tables20170921142016467" visible="0" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" style="default" expanded="1"/>
-      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" style="default" expanded="1"/>
-      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Marshals"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Proposed Routes" has-expanded-info="1">
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="water_tables20170921142016467" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" 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"/>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Marshals"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Routes" has-expanded-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default" expanded="1"/>
+    <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="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
         <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 id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing" expanded="1"/>
+      <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="{29865286-9e35-459b-929c-beb87e7538de}"/>
         <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-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="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default" expanded="1"/>
+      <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"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="0" style="default" expanded="1"/>
+      <layer style="default" visible="0" id="water_tables20170921142016467" expanded="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" style="default" expanded="1"/>
+      <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 id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" style="default" expanded="1"/>
+      <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 id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
+      <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 id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
+      <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 id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default" expanded="1"/>
+      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing" expanded="1"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="water_tables20170921142016467" visible="1" style="default" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" style="default" expanded="1"/>
+    <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"/>
+      <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"/>
+      <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"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
         <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="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -29326,31 +27551,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -29365,49 +27590,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -29422,1048 +27647,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </LayoutItem>
-        <GuideCollection visible="1">
-          <Guide position="0" page="0" orientation="2" units="mm"/>
-        </GuideCollection>
-      </PageCollection>
-      <LayoutItem positionOnPage="9.44946,191.611,mm" htmlState="0" size="14.1764,7.471,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="9" referencePoint="0" excludeFromExports="0" visibility="1" labelText="[%&quot;Distance&quot;%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.44946,191.611,mm" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
-          <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <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="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="24.2445,191.81,mm" htmlState="0" size="29.2025,7.272,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="RACE ROUTE" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="24.2445,191.81,mm" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" marginX="0" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
-          <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <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="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="204.225,191.81,mm" htmlState="0" size="57.4836,6.8714,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="204.225,191.81,mm" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
-          <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <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="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="210.038,199.082,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 September 2020" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="210.038,199.082,mm" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
-          <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
-                </Option>
-                <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="color" v="255,255,255,255"/>
-                <prop k="joinstyle" v="bevel"/>
-                <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="128,128,128,255"/>
-                <prop k="outline_style" v="no"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="style" v="solid"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dd_properties>
-        </text-style>
-      </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="17.4718" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-              </Option>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-      </LayoutItem>
-      <LayoutItem positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.59946,198.832,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-            <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
-            </Option>
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="0,0,0,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="0,0,0,255"/>
-            <prop k="outline_style" v="solid"/>
-            <prop k="outline_width" v="0.3"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
-            <data_defined_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </data_defined_properties>
-          </layer>
-        </symbol>
-      </LayoutItem>
-      <LayoutItem positionOnPage="5.86559,4.09761,mm" size="67.7828,166.874,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.86559,4.09761,mm" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-              </Option>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-            <srsid>3452</srsid>
-            <srid>4326</srid>
-            <authid>EPSG:4326</authid>
-            <description>WGS 84</description>
-            <projectionacronym>longlat</projectionacronym>
-            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-            <geographicflag>true</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
-          <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                </Option>
-                <prop k="align_dash_pattern" v="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"/>
-                <prop k="customdash_unit" v="MM"/>
-                <prop k="dash_pattern_offset" v="0"/>
-                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="dash_pattern_offset_unit" v="MM"/>
-                <prop k="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <prop k="line_width_unit" v="MM"/>
-                <prop k="offset" v="0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="ring_filter" v="0"/>
-                <prop k="trim_distance_end" v="0"/>
-                <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_end_unit" v="MM"/>
-                <prop k="trim_distance_start" v="0"/>
-                <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_start_unit" v="MM"/>
-                <prop k="tweak_dash_pattern_on_corners" v="0"/>
-                <prop k="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </lineStyle>
-          <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
-                </Option>
-                <prop k="angle" v="0"/>
-                <prop k="cap_style" v="square"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
-            <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                  <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
-                  </Option>
-                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="color" v="255,255,255,255"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <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="128,128,128,255"/>
-                  <prop k="outline_style" v="no"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="style" v="solid"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-            <dd_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </dd_properties>
-          </text-style>
-          <LayoutObject>
-            <dataDefinedProperties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </dataDefinedProperties>
-            <customproperties>
-              <Option/>
-            </customproperties>
-          </LayoutObject>
-        </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
-      </LayoutItem>
-      <LayoutItem positionOnPage="9.44946,9.08557,mm" size="282.012,174.44,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="true" position="9.44946,9.08557,mm" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-        <LayoutObject>
-          <dataDefinedProperties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '13000'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '5500'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '24000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.370'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.374'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3975'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '18.36'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.930'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.912'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '-33.959'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
-                </Option>
-              </Option>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </dataDefinedProperties>
-          <customproperties>
-            <Option/>
-          </customproperties>
-        </LayoutObject>
-        <Extent xmin="18.37000000000000099" ymax="-33.89719473757251222" xmax="18.42303517425787263" ymin="-33.92999999999999972"/>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-            <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-            <srsid>3452</srsid>
-            <srid>4326</srid>
-            <authid>EPSG:4326</authid>
-            <description>WGS 84</description>
-            <projectionacronym>longlat</projectionacronym>
-            <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-            <geographicflag>true</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
-          <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                </Option>
-                <prop k="align_dash_pattern" v="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"/>
-                <prop k="customdash_unit" v="MM"/>
-                <prop k="dash_pattern_offset" v="0"/>
-                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="dash_pattern_offset_unit" v="MM"/>
-                <prop k="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <prop k="line_width_unit" v="MM"/>
-                <prop k="offset" v="0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="ring_filter" v="0"/>
-                <prop k="trim_distance_end" v="0"/>
-                <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_end_unit" v="MM"/>
-                <prop k="trim_distance_start" v="0"/>
-                <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_start_unit" v="MM"/>
-                <prop k="tweak_dash_pattern_on_corners" v="0"/>
-                <prop k="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </lineStyle>
-          <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
-                <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
-                </Option>
-                <prop k="angle" v="0"/>
-                <prop k="cap_style" v="square"/>
-                <prop k="color" v="0,0,0,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="0,0,0,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" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
-            <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-                  <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
-                  </Option>
-                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="color" v="255,255,255,255"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <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="128,128,128,255"/>
-                  <prop k="outline_style" v="no"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="style" v="solid"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
-            <dd_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </dd_properties>
-          </text-style>
-          <LayoutObject>
-            <dataDefinedProperties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </dataDefinedProperties>
-            <customproperties>
-              <Option/>
-            </customproperties>
-          </LayoutObject>
-        </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.10000000000000001"/>
-        <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
-          <layersToClip/>
-        </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
-      </LayoutItem>
-      <customproperties>
-        <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfAppendGeoreference" value="1"/>
-          <Option type="QString" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportGeoPdfFeatures" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="QString" name="pdfSimplify" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
-        </Option>
-      </customproperties>
-      <Atlas coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21|Trail)' )" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortAscending="1" coverageLayerName="all_routes" coverageLayerProvider="ogr" filterFeatures="1" sortFeatures="1" sortKey="&quot;Sort&quot;" pageNameExpression="&quot;Distance&quot;" enabled="1"/>
-    </Layout>
-    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
-      <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-            <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
-            </Option>
-            <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-            <prop k="color" v="255,255,255,255"/>
-            <prop k="joinstyle" v="miter"/>
-            <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="0,0,0,255"/>
-            <prop k="outline_style" v="no"/>
-            <prop k="outline_width" v="0.26"/>
-            <prop k="outline_width_unit" v="MM"/>
-            <prop k="style" v="solid"/>
-            <data_defined_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </data_defined_properties>
-          </layer>
-        </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
-          <LayoutObject>
-            <dataDefinedProperties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </dataDefinedProperties>
-            <customproperties>
-              <Option/>
-            </customproperties>
-          </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
-              <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
-              </Option>
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="255,255,255,255"/>
-              <prop k="joinstyle" v="miter"/>
-              <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="no"/>
-              <prop k="outline_width" v="0.26"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30471,15 +27657,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.1,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="110.353,5.04491,mm" blendMode="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="39.4312,46.1,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" zValue="5" rasterBorder="1" groupUuid="" position="110.353,5.04491,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frameJoinStyle="bevel" title="" background="true">
-        <FrameColor alpha="255" blue="128" green="128" red="128"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30487,48 +27673,48 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Unchecked">
+          <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" legend_exp="" name="fencing" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="legend/node-order" value="0,1,2"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option value="0,1,2" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30536,62 +27722,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="98.7828,149.027,mm" size="56.5192,54.5647,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal map - inset" background="true" itemRotation="0" outlineWidthM="0.2,mm" zValue="4" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="98.7828,149.027,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41064302246786966" ymax="-33.89902512102636223" xmax="18.41493455420295433" ymin="-33.90316824413850583"/>
+        <Extent xmin="18.41064302246786966" ymax="-33.89902512102636223" ymin="-33.90316824413850583" xmax="18.41493455420295433"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -30622,44 +27808,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -30682,40 +27868,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -30730,29 +27916,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30760,28 +27946,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview centered="1" position="3" name="Overview 1" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <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">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,65,170,127"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,102"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,65,170,127"/>
@@ -30796,9 +27982,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30806,9 +27992,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30816,69 +28002,69 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="3.53,6.0007,mm" size="142,187.018,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal map - main" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="3.53,6.0007,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41227535330844844" ymax="-33.90042047455022356" xmax="18.41330222336237554" ymin="-33.9017728906146445"/>
+        <Extent xmin="18.41227535330844844" ymax="-33.90042047455022356" ymin="-33.9017728906146445" xmax="18.41330222336237554"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -30909,44 +28095,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -30969,40 +28155,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -31017,29 +28203,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31047,22 +28233,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="290.617,6.0007,mm" size="142.117,187.018,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" opacity="1" blendMode="0" type="65647" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" sectionX="0" referencePoint="2" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" sectionWidth="142.117" sectionY="0" sectionHeight="182.4" positionLock="true" position="290.617,6.0007,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" hideBackgroundIfEmpty="0" hidePageIfEmpty="0" id="" frame="false">
-        <FrameColor alpha="255" blue="119" green="119" red="119"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31070,21 +28256,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="246.665,178.41,mm" size="47.1065,27.6,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="0" outlineWidthM="0.3,mm" pictureHeight="27.6" zValue="1" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="246.665,178.41,mm" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="27.4317">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31092,14 +28278,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>" maxBreakDistance="12" type="65648" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" contentMode="1" resizeMode="0" url="" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
+      <LayoutMultiFrame 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}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31109,53 +28295,53 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="jpg"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropMarginUnit" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="rasterize" value="false"/>
-          <Option type="QString" name="resizeToContentsBottomMargin" value="3.53"/>
-          <Option type="QString" name="resizeToContentsLeftMargin" value="3.53"/>
-          <Option type="QString" name="resizeToContentsRightMargin" value="3.53"/>
-          <Option type="QString" name="resizeToContentsTopMargin" value="3.53"/>
-          <Option type="QString" name="singleFile" value="false"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" hideCoverage="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortAscending="1" coverageLayerName="marshal_positions" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="1" sortKey="position" pageNameExpression="&quot;position&quot;" enabled="1"/>
+      <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"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -31170,49 +28356,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31227,9 +28413,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31237,21 +28423,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionOnPage="286.027,2,mm" size="9.45865,11,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureRotation="330" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="0" outlineWidthM="0.3,mm" pictureHeight="7.97477" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="286.027,2,mm" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderColor="0,0,0,255" mode="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" northMode="0" id="" frame="false" file="arrows/NorthArrow_11.svg" pictureWidth="6.31767">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31259,47 +28445,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="285.027,205.886,mm" htmlState="0" size="142.543,10.3185,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="270" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" labelText="[%upper( &quot;area&quot; )%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="285.027,205.886,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31314,65 +28500,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem lineCapStyle="square" maxBarWidth="150" type="65646" opacity="1" outlineWidthM="0.3,mm" unitType="meters" numSubdivisions="1" positionOnPage="7,189.669,mm" blendMode="0" minBarWidth="50" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" visibility="1" frame="false" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" style="Single Box" alignment="0" labelHorizontalPlacement="0" itemRotation="0" size="145.54,16.2165,mm" positionLock="true" unitLabel="m" referencePoint="0" labelVerticalPlacement="0" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" zValue="2" subdivisionsHeight="1.5" segmentMillimeters="26.3519" groupUuid="" position="7,189.669,mm" id="" numSegments="4" numUnitsPerSegment="100" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" lineJoinStyle="miter" segmentSizeMode="1" boxContentSpace="1" labelBarSpace="3" frameJoinStyle="miter" numSegmentsLeft="2" background="false" height="3" outlineWidth="0.3">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31387,75 +28573,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" green="0" red="0"/>
+        <strokeColor red="0" green="0" blue="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" name="decimal_separator" value=""/>
-            <Option type="int" name="decimals" value="6"/>
-            <Option type="int" name="rounding_type" value="0"/>
-            <Option type="bool" name="show_plus" value="false"/>
-            <Option type="bool" name="show_thousand_separator" value="true"/>
-            <Option type="bool" name="show_trailing_zeros" value="false"/>
-            <Option type="QChar" name="thousand_separator" value=""/>
+            <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>
         </numericFormat>
-        <fillColor alpha="255" blue="0" green="0" red="0"/>
-        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
+        <fillColor red="0" green="0" blue="0" alpha="255"/>
+        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
         <lineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.3"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -31486,52 +28672,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.3"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -31562,52 +28748,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.3"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -31638,36 +28824,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -31682,36 +28868,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31726,87 +28912,87 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem positionOnPage="7,5.5,mm" size="278.027,180.318,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Start/Finish" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="330" positionLock="true" position="7,5.5,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="rotation"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="rotation" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="id"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="id" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="angle" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40843143571575169" ymax="-33.89880140828828559" xmax="18.41790915398017958" ymin="-33.90494830469008747"/>
+        <Extent xmin="18.40843143571575169" ymax="-33.89880140828828559" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="5" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="1" intervalY="5" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="3" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="4" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="195,195,195,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -31837,44 +29023,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -31897,9 +29083,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -31916,32 +29102,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -31956,29 +29142,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31986,65 +29172,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
-          <Option type="QString" name="svgCropMarginBottom" value="0"/>
-          <Option type="QString" name="svgCropMarginLeft" value="0"/>
-          <Option type="QString" name="svgCropMarginRight" value="0"/>
-          <Option type="QString" name="svgCropMarginTop" value="0"/>
-          <Option type="QString" name="svgCropToContents" value="true"/>
-          <Option type="QString" name="svgDisableRasterTiles" value="0"/>
-          <Option type="QString" name="svgGroupLayers" value="false"/>
-          <Option type="QString" name="svgIncludeMetadata" value="1"/>
-          <Option type="QString" name="svgTextFormat" value="0"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortAscending="1" coverageLayerName="start_finish_area" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="1" sortKey="area" pageNameExpression="&quot;area&quot;" enabled="1"/>
+      <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"/>
     </Layout>
-    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -32059,49 +29245,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -32116,9 +29302,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32126,47 +29312,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionOnPage="6.76779,190.27,mm" htmlState="0" size="148.46,7.36972,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="11" referencePoint="0" excludeFromExports="0" visibility="1" labelText="FENCING: [% &quot;name&quot; %]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="6.76779,190.27,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32181,65 +29367,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="211.295,197.64,mm" htmlState="0" size="27.7839,7.51682,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="10" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="211.295,197.64,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32254,65 +29440,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="115.637,198.083,mm" htmlState="0" size="67.0856,7.80192,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="9" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="115.637,198.083,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32327,65 +29513,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="59.5581,198.083,mm" htmlState="0" size="53.0017,7.80192,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="59.5581,198.083,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32400,65 +29586,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="6.76779,198.083,mm" htmlState="0" size="52.7903,7.80192,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Page [% @atlas_featurenumber %]" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="6.76779,198.083,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32473,39 +29659,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="243.098,175.353,mm" size="49.3143,29.8354,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="8" outlineWidthM="0.3,mm" pictureHeight="29.8354" zValue="6" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="243.098,175.353,mm" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="29.6535">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32513,47 +29699,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="182.723,190.271,mm" htmlState="0" size="56.3557,7.36902,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 September 2020" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="182.723,190.271,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32568,60 +29754,60 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="6.91779,197.79,mm" size="232.01,0.14328,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="6.91779,197.79,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32636,55 +29822,55 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem lineCapStyle="square" maxBarWidth="100" type="65646" opacity="1" outlineWidthM="0.3,mm" unitType="meters" numSubdivisions="1" positionOnPage="6.76779,2.8482,mm" blendMode="0" minBarWidth="25" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" visibility="1" frame="false" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" style="Double Box" alignment="0" labelHorizontalPlacement="0" itemRotation="0" size="95.0404,15.8378,mm" positionLock="true" unitLabel="m" referencePoint="0" labelVerticalPlacement="0" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" zValue="3" subdivisionsHeight="1.5" segmentMillimeters="28.4264" groupUuid="" position="6.76779,2.8482,mm" id="" numSegments="2" numUnitsPerSegment="10" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" lineJoinStyle="round" segmentSizeMode="1" boxContentSpace="0.2" labelBarSpace="1" frameJoinStyle="miter" numSegmentsLeft="2" background="false" height="2" outlineWidth="0.2">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32699,75 +29885,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" green="0" red="0"/>
+        <strokeColor red="0" green="0" blue="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" name="decimal_separator" value=""/>
-            <Option type="int" name="decimals" value="6"/>
-            <Option type="int" name="rounding_type" value="0"/>
-            <Option type="bool" name="show_plus" value="false"/>
-            <Option type="bool" name="show_thousand_separator" value="true"/>
-            <Option type="bool" name="show_trailing_zeros" value="false"/>
-            <Option type="QChar" name="thousand_separator" value=""/>
+            <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>
         </numericFormat>
-        <fillColor alpha="255" blue="0" green="0" red="0"/>
-        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
+        <fillColor red="0" green="0" blue="0" alpha="255"/>
+        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
         <lineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -32798,52 +29984,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -32874,52 +30060,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <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>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -32950,36 +30136,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 type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -32994,36 +30180,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -33038,24 +30224,24 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="0" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="256.808,2.9982,mm" blendMode="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="38.1563,54.9504,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" zValue="2" rasterBorder="1" groupUuid="" position="256.808,2.9982,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter" title="" background="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33063,52 +30249,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="Bold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
-            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
+          <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>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" source="./fencing.shp|layername=fencing" legend_exp="" name="fencing" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-                  <Option type="QString" name="legend/expressionFilter" value=""/>
-                  <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <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>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33116,44 +30302,44 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="6.76779,9.35102,mm" size="283.418,180.92,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Fencing" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="6.76779,9.35102,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
                   <Option type="Map" name="transformer">
                     <Option type="Map" name="d">
-                      <Option type="double" name="exponent" value="1"/>
-                      <Option type="double" name="maxOutput" value="360"/>
-                      <Option type="double" name="maxValue" value="0"/>
-                      <Option type="double" name="minOutput" value="0"/>
-                      <Option type="double" name="minValue" value="0"/>
-                      <Option type="double" name="nullOutput" value="0"/>
+                      <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>
-                    <Option type="int" name="t" value="0"/>
+                    <Option value="0" type="int" name="t"/>
                   </Option>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="angle" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41635400827248503" ymax="-33.90364055490629625" xmax="18.4172496509604926" ymin="-33.90421228789515595"/>
+        <Extent xmin="18.41635400827248503" ymax="-33.90364055490629625" 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>
@@ -33168,45 +30354,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="5" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="1" intervalY="5" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="3" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="4" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="3" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="195,195,195,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33237,44 +30423,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33297,9 +30483,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -33316,32 +30502,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33356,29 +30542,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33386,62 +30572,62 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.40000000000000002"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfAppendGeoreference" value="1"/>
-          <Option type="QString" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportGeoPdfFeatures" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="QString" name="pdfSimplify" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="rasterize" value="true"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" 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" sortAscending="1" coverageLayerName="fence_groups" coverageLayerProvider="virtual" filterFeatures="0" sortFeatures="1" sortKey="group" pageNameExpression="&quot;name&quot;" enabled="1"/>
+      <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"/>
     </Layout>
-    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="9" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -33456,49 +30642,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -33513,9 +30699,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33525,47 +30711,47 @@ def my_form_open(dialog, layer, feature):
           <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="4.43449,186.634,mm" htmlState="0" size="83.9998,10.4638,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Directions to Start of Race" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="false" position="4.43449,186.634,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33580,65 +30766,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="4.43449,197.498,mm" htmlState="0" size="48.2923,9.511,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Gun Run" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="false" position="4.43449,197.498,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33653,33 +30839,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="5" columnSpace="0" positionOnPage="10.096,10.8563,mm" blendMode="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="59.0766,76,mm" positionLock="false" referencePoint="0" symbolAlignment="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" zValue="6" rasterBorder="1" groupUuid="" position="10.096,10.8563,mm" id="" lineSpacing="2" symbolWidth="9" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frameJoinStyle="round" title="" legendFilterByMap="1" background="true">
-        <FrameColor alpha="255" blue="139" green="139" red="139"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33687,52 +30873,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="subgroup" indent="0">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" marginLeft="3" name="symbolLabel" indent="0" marginTop="2.5">
-            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
+          <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>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Ask Me" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Ask Me" groupLayer="" expanded="1">
             <customproperties>
               <Option type="Map">
-                <Option type="QString" name="legend/title-style" value="hidden"/>
+                <Option value="hidden" type="QString" name="legend/title-style"/>
               </Option>
             </customproperties>
-            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" source="./poi_labels.shp|layername=poi_labels" legend_exp="" name="poi_labels" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="legend/label-0" value="Start/Finish"/>
-                  <Option type="QString" name="legend/label-1" value="Toilets"/>
-                  <Option type="QString" name="legend/label-2" value="Tog Bag Drop-off"/>
-                  <Option type="QString" name="legend/label-3" value="Road Closed to Cars"/>
-                  <Option type="QString" name="legend/label-4" value="MyCiti Drop-off"/>
-                  <Option type="QString" name="legend/label-5" value="Parking"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <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>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" name="directions_to_start" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="legend/label-0" value="To 21KM Start (06:30)"/>
-                  <Option type="QString" name="legend/label-1" value="To 10KM Start (07:30)"/>
-                  <Option type="QString" name="legend/label-2" value="To 5KM Start (08:30)"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <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>
               </customproperties>
             </layer-tree-layer>
@@ -33740,47 +30926,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="221.862,190.027,mm" htmlState="0" size="27.7839,6.871,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="false" position="221.862,190.027,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33795,65 +30981,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="197.975,197.498,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="false" position="197.975,197.498,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33868,39 +31054,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="249.646,179.724,mm" size="42.9838,24.3824,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="24.3824" zValue="3" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="249.646,179.724,mm" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="24.2337">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33908,42 +31094,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="4.58449,197.248,mm" size="244.912,0.1,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="4.58449,197.248,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -33958,46 +31144,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="4.43449,6.411,mm" size="288.007,183.616,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Ask Me" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="false" position="4.43449,6.411,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39762336729721071" ymax="-33.8970204297764468" xmax="18.41789384089274151" ymin="-33.90994364588821952"/>
+        <Extent xmin="18.39762336729721071" ymax="-33.8970204297764468" 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>
@@ -34012,45 +31198,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -34081,44 +31267,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -34141,40 +31327,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -34189,29 +31375,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34219,56 +31405,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" sortFeatures="0" pageNameExpression="" enabled="0"/>
+      <Atlas hideCoverage="0" pageNameExpression="" sortFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" coverageLayer="" enabled="0"/>
     </Layout>
-    <Layout name="All Routes" units="mm" printResolution="144" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -34283,49 +31469,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -34340,9 +31526,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34352,47 +31538,47 @@ def my_form_open(dialog, layer, feature):
           <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="200.171,199.082,mm" htmlState="0" size="61.5373,6.8714,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="13" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 2.5" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="200.171,199.082,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34407,65 +31593,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.7863,192.073,mm" htmlState="0" size="61.5373,6.60801,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="12" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Gun Run 2022: [%&quot;Source&quot;%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.7863,192.073,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34480,65 +31666,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.7863,199.082,mm" htmlState="0" size="61.5373,6.60801,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="11" referencePoint="0" excludeFromExports="0" visibility="1" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.7863,199.082,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34553,39 +31739,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="15.9472" zValue="10" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" northMode="0" id="" frame="false" file="../GunRun2022_250.png" pictureWidth="29.7523">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34593,42 +31779,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.57644,198.832,mm" size="251.982,0.1,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="9" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.57644,198.832,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -34643,321 +31829,321 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.57644,5.42566,mm" size="107.861,186.385,mm" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="9.57644,5.42566,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" mapFlags="0" id="Trail Finish" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39314911415855391" ymax="-33.90007566747966905" xmax="18.41187375074135701" ymin="-33.93243205975926458"/>
+        <Extent xmin="18.39314911415855391" ymax="-33.90007566747966905" ymin="-33.93243205975926458" xmax="18.41187375074135701"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="112.643,4.09761,mm" size="179.156,189.279,mm" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="112.643,4.09761,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" mapFlags="0" id="Trail Start" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3924263991010406" ymax="-33.92484901666441743" xmax="18.42354248737832023" ymin="-33.95772328900195447"/>
+        <Extent xmin="18.3924263991010406" ymax="-33.92484901666441743" ymin="-33.95772328900195447" xmax="18.42354248737832023"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.86559,4.09761,mm" size="67.7828,166.874,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.86559,4.09761,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapFlags="0" id="Left inset 21KM" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37399999999999878" ymax="-33.91681492292400435" xmax="18.38626092146919788" ymin="-33.94700000000000273"/>
+        <Extent xmin="18.37399999999999878" ymax="-33.91681492292400435" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="126.141,118.975,mm" size="113.3,76.1023,mm" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="126.141,118.975,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" mapFlags="0" id="Bottom inset 21KM" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="144" green="34" red="103"/>
-        <BackgroundColor alpha="255" blue="215" green="175" red="200"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41509620662891678" ymax="-33.91132718340826813" xmax="18.42329132157224336" ymin="-33.9168317482614512"/>
+        <Extent xmin="18.41509620662891678" ymax="-33.91132718340826813" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
         <LayerSet/>
-        <AtlasMap scalingMode="0" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="19.6693,7.89412,mm" size="68.3676,117.12,mm" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="0" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="19.6693,7.89412,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" mapFlags="0" id="End inset Trail" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.4044900556177744" ymax="-33.90099106513847005" xmax="18.41240136424316276" ymin="-33.91454383501641701"/>
+        <Extent xmin="18.4044900556177744" ymax="-33.90099106513847005" ymin="-33.91454383501641701" xmax="18.41240136424316276"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="170.062,49.6297,mm" size="63.655,88.3012,mm" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="0" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="170.062,49.6297,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" mapFlags="0" id="Start inset Trail" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41445559427620893" ymax="-33.94253141264477591" xmax="18.4185691326545431" ymin="-33.94823764719958348"/>
+        <Extent xmin="18.41445559427620893" ymax="-33.94253141264477591" ymin="-33.94823764719958348" xmax="18.4185691326545431"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="200.321,125.314,mm" size="75.8756,69.7635,mm" uuid="{917a530c-14f4-4ed8-b109-961939435221}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="0" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="200.321,125.314,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" mapFlags="0" id="Contour inset Trail" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41234259163472942" ymax="-33.94692690566557047" xmax="18.42332635419156972" ymin="-33.95702588572736147"/>
+        <Extent xmin="18.41234259163472942" ymax="-33.94692690566557047" ymin="-33.95702588572736147" xmax="18.42332635419156972"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="1" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="1" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.50144,5.50066,mm" size="282.372,186.234,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Routes" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="true" position="9.50144,5.50066,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapFlags="0" id="Main Map" frame="true" drawCanvasItems="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" 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"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" 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.3985'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" 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.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36400000000000077" ymax="-33.89971434483385337" xmax="18.4538899796794631" ymin="-33.95900000000000318"/>
+        <Extent xmin="18.36400000000000077" ymax="-33.89975491889535419" ymin="-33.95900000000000318" xmax="18.45389078066072486"/>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -34988,44 +32174,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -35048,40 +32234,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -35096,29 +32282,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35126,34 +32312,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview centered="0" position="3" name="Overview 1" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" inverted="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}">
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <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">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="alpha">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                    <Option type="int" name="type" value="3"/>
+                    <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>
                 </Option>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="103,34,144,26"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="103,34,144,26"/>
@@ -35168,9 +32354,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35178,9 +32364,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35188,63 +32374,63 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.06" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="int" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="int" name="pdfAppendGeoreference" value="1"/>
-          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="int" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~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_7b072d1e_ad75_4233_a306_a6e83facfea1~~~route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7"/>
-          <Option type="int" name="pdfLosslessImages" value="0"/>
-          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="int" name="pdfSimplify" value="1"/>
-          <Option type="int" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" hideCoverage="0" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortAscending="1" coverageLayerName="all_routes" coverageLayerProvider="ogr" filterFeatures="1" sortFeatures="1" sortKey="&quot;Sort&quot;" pageNameExpression="&quot;Distance&quot;" enabled="1"/>
+      <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"/>
     </Layout>
-    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -35259,49 +32445,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="594,841,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -35316,9 +32502,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35326,15 +32512,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="25.5925,18.7971,mm" blendMode="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" visibility="1" fontColor="#000000" wrapChar="" frame="false" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="4,4,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" zValue="8" rasterBorder="1" groupUuid="" position="25.5925,18.7971,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frameJoinStyle="miter" title="" background="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35342,37 +32528,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes20170907054841602" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer checked="Qt::Checked" legend_exp="" name="all_routes" id="all_routes20170907054841602" legend_split_behavior="0" patch_size="0,0" expanded="1">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="QString" name="showFeatureCount" value="0"/>
+                  <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>
               </customproperties>
             </layer-tree-layer>
@@ -35380,47 +32566,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.2963,808.939,mm" htmlState="0" size="91.9494,15.0649,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="MARSHAL POSITIONS" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="5.2963,808.939,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginX="1" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35435,65 +32621,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="430.403,825.052,mm" htmlState="0" size="56.6212,15.3656,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.2" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="430.403,825.052,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35508,65 +32694,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="372.175,808.942,mm" htmlState="0" size="114.848,15.0635,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="372.175,808.942,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35581,39 +32767,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="489.557,775.395,mm" size="100.498,63.9757,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="8" outlineWidthM="0.3,mm" pictureHeight="63.9757" zValue="3" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="489.557,775.395,mm" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="63.5856">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35621,42 +32807,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.4463,824.155,mm" size="481.428,0.606138,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="5.4463,824.155,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -35671,90 +32857,90 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="3.94474,5.25965,mm" size="584.759,811.213,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal overview" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="3.94474,5.25965,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37434415142052657" ymax="-33.89072661913806428" xmax="18.42299397558693741" ymin="-33.95821655848814657"/>
+        <Extent xmin="18.37434415142052657" ymax="-33.89072661913806428" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0"/>
+        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortAscending="1" coverageLayerName="complete_marshal_overview" coverageLayerProvider="virtual" filterFeatures="0" sortFeatures="1" sortKey="page" pageNameExpression="&quot;page&quot;" enabled="1"/>
+      <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"/>
     </Layout>
-    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -35769,49 +32955,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -35826,9 +33012,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35838,15 +33024,15 @@ def my_form_open(dialog, layer, feature):
           <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="244.484,130.172,mm" blendMode="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" fontColor="#000000" wrapChar="" frame="true" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="34.45,40.8,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" zValue="15" rasterBorder="1" groupUuid="" position="244.484,130.172,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="0" frameJoinStyle="miter" title="" background="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="185" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35854,35 +33040,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
-            <styleFont style="Regular" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" bold="0"/>
+          <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>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Residents Access" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Residents Access" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" name="residents_access_roads" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -35890,47 +33076,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.37446,191.81,mm" htmlState="0" size="194.851,7.272,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="ACCESS ROUTES FOR RESIDENTS" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.37446,191.81,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginX="0" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35945,65 +33131,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="204.225,191.81,mm" htmlState="0" size="57.4836,6.8714,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.1" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="204.225,191.81,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36018,65 +33204,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="210.038,199.082,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="210.038,199.082,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36091,39 +33277,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="17.4718" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderColor="0,0,0,255" mode="1" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36131,42 +33317,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.59946,198.832,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -36181,61 +33367,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.86559,4.09761,mm" size="67.7828,166.874,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Access Routes" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.86559,4.09761,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="1" type="int" name="type"/>
+                  <Option value="" type="QString" name="val"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
+        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" 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>
@@ -36250,45 +33436,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -36319,44 +33505,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -36379,40 +33565,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -36427,29 +33613,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -36457,45 +33643,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.44946,9.08557,mm" size="282.012,175.592,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Access Routes" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="true" position="9.44946,9.08557,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapFlags="0" id="" frame="true" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" ymax="-33.89697816224119009" xmax="18.42303507276415431" ymin="-33.92999999999999972"/>
+        <Extent xmin="18.37000000000000099" ymax="-33.89697816224119009" 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>
@@ -36510,45 +33696,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -36579,44 +33765,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -36639,40 +33825,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -36687,29 +33873,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -36717,56 +33903,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="false"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" enabled="1"/>
+      <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"/>
     </Layout>
-    <Layout name="Golf Course Access" units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -36781,49 +33967,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,210,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -36838,9 +34024,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -36850,47 +34036,47 @@ def my_form_open(dialog, layer, feature):
           <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem positionOnPage="9.37446,191.81,mm" htmlState="0" size="194.851,7.272,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="8" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Access to P9 Parking and VIP Tent" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="9.37446,191.81,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginX="0" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="14" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36905,65 +34091,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="204.225,191.81,mm" htmlState="0" size="57.4836,6.8714,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="204.225,191.81,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36978,65 +34164,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="210.038,199.082,mm" htmlState="0" size="51.6706,6.60801,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="210.038,199.082,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginX="1" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37051,39 +34237,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="4" outlineWidthM="0.3,mm" pictureHeight="17.4718" zValue="4" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="262.196,188.218,mm" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -37091,42 +34277,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="3" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="9.59946,198.832,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -37141,46 +34327,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="9.44946,7.25098,mm" size="282.012,182.649,mm" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="" background="true" itemRotation="0" outlineWidthM="0.15,mm" zValue="1" followPreset="false" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="round" mapRotation="0" positionLock="false" position="9.44946,7.25098,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                  <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>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40103928699269886" ymax="-33.90319854486631357" xmax="18.40919746780259914" ymin="-33.90848231674397084"/>
+        <Extent xmin="18.40103928699269886" ymax="-33.90319854486631357" 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>
@@ -37195,45 +34381,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFrameSideFlags="15" rotatedTicksLengthMode="0" rightAnnotationDirection="0" annotationExpression="" gridFrameMargin="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" maximumIntervalWidth="100" intervalX="0" bottomAnnotationDirection="0" topAnnotationPosition="1" crossLength="3" rightFrameDivisions="0" rightAnnotationPosition="1" frameAnnotationDistance="1" blendMode="0" gridFramePenThickness="0.5" rotatedAnnotationsLengthMode="0" bottomFrameDivisions="0" leftFrameDivisions="0" offsetY="0" leftAnnotationDirection="0" unit="0" intervalY="0" showAnnotation="0" gridFramePenColor="0,0,0,255" show="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" minimumIntervalWidth="50" rotatedAnnotationsMinimumAngle="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" rightAnnotationDisplay="0" position="3" gridFrameWidth="2" rotatedTicksEnabled="0" rotatedTicksMinimumAngle="0" topFrameDivisions="0" name="Grid 1" topAnnotationDirection="0" annotationFormat="0" offsetX="0" annotationPrecision="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" gridFrameStyle="0" frameFillColor2="0,0,0,255" leftAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" gridStyle="0">
+        <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">
           <lineStyle>
-            <symbol type="line" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleLine" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <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>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -37264,44 +34450,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 type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol type="marker" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <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>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -37324,40 +34510,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="10" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+          <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">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-            <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-              <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+            <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">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <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>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -37372,29 +34558,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+            <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"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -37402,56 +34588,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="false"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" enabled="0"/>
+      <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"/>
     </Layout>
-    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetUnits="mm" resolution="10" resUnits="mm" offsetX="0" offsetY="0"/>
+    <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"/>
       <PageCollection>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -37466,49 +34652,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem positionOnPage="0,0,mm" size="297,420,mm" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" blendMode="0" type="65638" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="0" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="false" position="0,0,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" id="" frame="false">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <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"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <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>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -37523,9 +34709,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -37533,47 +34719,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem positionOnPage="112.086,406.476,mm" htmlState="1" size="23.5967,8.3142,mm" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="14" referencePoint="0" excludeFromExports="0" visibility="1" labelText="Page [% &quot;page&quot; %] " groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="112.086,406.476,mm" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" marginX="0" halign="4" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37588,33 +34774,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem wmsLegendWidth="50" type="65642" splitLayer="0" resizeToContents="1" minSymbolSize="0" opacity="1" outlineWidthM="0.3,mm" columnCount="1" wmsLegendHeight="25" symbolHeight="4" columnSpace="2" positionOnPage="15.6525,12.5708,mm" blendMode="0" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" visibility="1" fontColor="#000000" wrapChar="" frame="false" legendFilterByAtlas="0" rasterBorderColor="0,0,0,255" titleAlignment="1" boxSpace="2" itemRotation="0" rasterBorderWidth="0" size="21.6797,33,mm" positionLock="true" referencePoint="0" symbolAlignment="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" zValue="8" rasterBorder="1" groupUuid="" position="15.6525,12.5708,mm" id="" lineSpacing="1" symbolWidth="7" excludeFromExports="0" maxSymbolSize="0" equalColumnWidth="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frameJoinStyle="miter" title="" background="true">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -37622,37 +34808,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <styleFont style="" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" bold="0"/>
+          <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>
-          <style alignment="1" marginLeft="2" name="symbolLabel" indent="0" marginTop="2">
-            <styleFont style="Semibold" italic="0" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" bold="1"/>
+          <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>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" source="./all_routes.shp|layername=all_routes" legend_exp="" name="all_routes" expanded="1" patch_size="0,0" providerKey="ogr" checked="Qt::Checked" legend_split_behavior="0">
+            <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">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="int" name="showFeatureCount" value="0"/>
+                  <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>
               </customproperties>
             </layer-tree-layer>
@@ -37660,47 +34846,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,398.344,mm" htmlState="0" size="45.1194,8.13137,mm" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="7" referencePoint="0" excludeFromExports="0" visibility="1" labelText="MARSHAL POSITIONS" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="5.69321,398.344,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" marginX="0" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="63" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37715,65 +34901,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.69321,406.988,mm" htmlState="1" size="118.192,7.80192,mm" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="6" referencePoint="0" excludeFromExports="0" visibility="1" 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>" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="5.69321,406.988,mm" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" marginX="0" halign="1" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37788,65 +34974,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="214.292,406.874,mm" htmlState="0" size="27.7839,7.51682,mm" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="5" referencePoint="0" excludeFromExports="0" visibility="1" labelText="REVISION 3.0" groupUuid="" frameJoinStyle="miter" valign="32" positionLock="true" position="214.292,406.874,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" marginX="0" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37861,65 +35047,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="148.501,398.344,mm" htmlState="1" size="93.5757,8.13167,mm" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" opacity="1" blendMode="0" marginY="1" type="65641" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="4" referencePoint="0" excludeFromExports="0" visibility="1" 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>" groupUuid="" frameJoinStyle="miter" valign="64" positionLock="true" position="148.501,398.344,mm" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" marginX="0" halign="2" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style textColor="0,0,0,255" fontUnderline="0" allowHtml="0" blendMode="0" fontFamily="Myriad Pro" namedStyle="" fontWordSpacing="0" fontItalic="0" fontSize="12" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" forcedItalic="0" forcedBold="0" fontWeight="50" fontLetterSpacing="0" fontKerning="1" textOpacity="1" capitalization="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" multilineHeight="1" fontSizeUnit="Point">
+        <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">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="255,255,255,255"/>
-          <text-mask maskEnabled="0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeType="0" shapeBlendMode="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeBorderWidth="0" shapeJoinStyle="64" shapeOffsetY="0" shapeSVGFile="" shapeRotationType="0" shapeRadiiUnit="MM" shapeRotation="0" shapeOffsetUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeSizeY="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetX="0">
-            <symbol type="fill" alpha="1" name="fillSymbol" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+          <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">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <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>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37934,39 +35120,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetAngle="135" shadowUnder="0" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowScale="100" shadowColor="0,0,0,255"/>
+          <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"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem positionOnPage="243.319,382.696,mm" size="49.3143,31.2967,mm" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" pictureRotation="0" opacity="1" blendMode="0" resizeMode="0" svgFillColor="255,255,255,255" northOffset="0" type="65640" background="false" itemRotation="0" anchorPoint="8" outlineWidthM="0.3,mm" pictureHeight="26.4325" zValue="3" referencePoint="0" excludeFromExports="0" svgBorderWidth="0.2" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="243.319,382.696,mm" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgBorderColor="0,0,0,255" mode="1" mapUuid="" northMode="0" id="" frame="false" file="../GunRun2022_250.png" pictureWidth="49.3143">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -37974,42 +35160,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.84321,406.626,mm" size="236.083,0.14328,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" shapeType="1" opacity="1" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" background="false" itemRotation="0" outlineWidthM="0.3,mm" zValue="2" referencePoint="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" positionLock="true" position="5.84321,406.626,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" id="" frame="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol type="fill" alpha="1" name="" clip_to_extent="1" frame_rate="10" force_rhr="0" is_animated="0">
+        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer class="SimpleFill" pass="0" enabled="1" locked="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <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>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -38024,78 +35210,78 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem positionOnPage="5.03,5.9483,mm" size="286.94,392.396,mm" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" labelMargin="0,mm" blendMode="0" type="65639" followPresetName="Marshal overview" background="true" itemRotation="0" outlineWidthM="0.3,mm" zValue="1" followPreset="true" keepLayerSet="false" referencePoint="0" isTemporal="0" excludeFromExports="0" visibility="1" groupUuid="" frameJoinStyle="miter" mapRotation="0" positionLock="true" position="5.03,5.9483,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" mapFlags="0" id="" frame="false" drawCanvasItems="false">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <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"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                  <Option value="false" type="bool" name="active"/>
+                  <Option value="" type="QString" name="field"/>
+                  <Option value="2" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36924763341120581" ymax="-33.9248732774534929" xmax="18.38613924055453452" ymin="-33.94797288016832226"/>
+        <Extent xmin="18.36924763341120581" ymax="-33.9248732774534929" ymin="-33.94797288016832226" xmax="18.38613924055453452"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings clippingType="0" restrictLayers="0" forceLabelsInside="0" enabled="0">
+        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clippingType="0" clipSource="" forceLabelsInside="0" enabled="0"/>
+        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="int" name="forceVector" value="0"/>
-          <Option type="int" name="pdfAppendGeoreference" value="1"/>
-          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="int" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~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"/>
-          <Option type="int" name="pdfLosslessImages" value="0"/>
-          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="int" name="pdfSimplify" value="1"/>
-          <Option type="int" name="pdfTextFormat" value="0"/>
+          <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>
       </customproperties>
-      <Atlas coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" hideCoverage="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortAscending="1" coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" filterFeatures="0" sortFeatures="1" sortKey="page" pageNameExpression="&quot;page&quot;" enabled="1"/>
+      <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"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmin="18.31333691080681803" ymax="-33.87127486098422935" xmax="18.47461092490271284" ymin="-33.95802701381087729">
+    <DefaultViewExtent xmin="18.39483932596524696" ymax="-33.90119829484044089" ymin="-33.91746432349552265" xmax="18.42507820360838267">
       <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>
@@ -38109,10 +35295,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1">
+  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStepUnit="h" timeStep="1" cumulativeTemporalRange="0" frameRate="1"/>
+  <ProjectTimeSettings cumulativeTemporalRange="0" timeStepUnit="h" timeStep="1" frameRate="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider scale="1" offset="0"/>
@@ -38121,29 +35307,29 @@ def my_form_open(dialog, layer, feature):
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option type="QChar" name="decimal_separator" value=""/>
-        <Option type="int" name="decimals" value="6"/>
-        <Option type="int" name="direction_format" value="0"/>
-        <Option type="int" name="rounding_type" value="0"/>
-        <Option type="bool" name="show_plus" value="false"/>
-        <Option type="bool" name="show_thousand_separator" value="true"/>
-        <Option type="bool" name="show_trailing_zeros" value="false"/>
-        <Option type="QChar" name="thousand_separator" value=""/>
+        <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>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option type="QString" name="angle_format" value="DecimalDegrees"/>
-        <Option type="QChar" name="decimal_separator" value=""/>
-        <Option type="int" name="decimals" value="6"/>
-        <Option type="int" name="rounding_type" value="0"/>
-        <Option type="bool" name="show_leading_degree_zeros" value="false"/>
-        <Option type="bool" name="show_leading_zeros" value="false"/>
-        <Option type="bool" name="show_plus" value="false"/>
-        <Option type="bool" name="show_suffix" value="false"/>
-        <Option type="bool" name="show_thousand_separator" value="true"/>
-        <Option type="bool" name="show_trailing_zeros" value="false"/>
-        <Option type="QChar" name="thousand_separator" value=""/>
+        <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>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/all_routes.dbf b/GIS Base Map/all_routes.dbf
index 5247542..5107103 100644
Binary files a/GIS Base Map/all_routes.dbf and b/GIS Base Map/all_routes.dbf differ
diff --git a/GIS Base Map/all_routes.shp b/GIS Base Map/all_routes.shp
index b2bd310..f7a4587 100644
Binary files a/GIS Base Map/all_routes.shp and b/GIS Base Map/all_routes.shp differ
diff --git a/GIS Base Map/all_routes.shx b/GIS Base Map/all_routes.shx
index 0947c2f..3058a2b 100644
Binary files a/GIS Base Map/all_routes.shx and b/GIS Base Map/all_routes.shx differ
diff --git a/README.md b/README.md
index d65883e..720d035 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,8 @@ WHEN "Source" = '21KM' THEN
 		WHEN regexp_match( "Name", '^([489]|10|1[123])$') THEN 'R,BR'
 		WHEN regexp_match( "Name", '^([25]|19)$') THEN 'T'
 		WHEN regexp_match( "Name", '^([7])$') THEN 'B'
+		WHEN regexp_match( "Name", '^Finish$') THEN 'BL,L'
+		WHEN regexp_match( "Name", '^Start$') THEN 'L,BL'
 	END
 WHEN "Source" = '10KM' THEN
 	CASE 
@@ -91,6 +93,8 @@ WHEN "Source" = '10KM' THEN
 		WHEN regexp_match( "Name", '^[2456]$') THEN 'R,BR'
 		WHEN regexp_match( "Name", '^[1]$') THEN 'T'
 		WHEN regexp_match( "Name", '^[3]$') THEN 'B'
+		WHEN regexp_match( "Name", '^Finish$') THEN 'TR,R'
+		WHEN regexp_match( "Name", '^Start$') THEN 'BL,L'
 	END
 WHEN "Source" = '5KM' THEN
 	CASE 
@@ -98,15 +102,16 @@ WHEN "Source" = '5KM' THEN
 		WHEN regexp_match( "Name", '^[0]$') THEN 'R,BR'
 		WHEN regexp_match( "Name", '^[4]$') THEN 'T'
 		WHEN regexp_match( "Name", '^[3]$') THEN 'B'
-
+		WHEN regexp_match( "Name", '^Finish$') THEN 'TR,R'
+		WHEN regexp_match( "Name", '^Start$') THEN 'BL,L'
 	END
 WHEN "Source" = 'Trail' THEN
 	CASE 
 		WHEN regexp_match( "Name", '^14$') THEN 'L,TL'
 		WHEN regexp_match( "Name", '^8$') THEN 'L,BL'
 		WHEN regexp_match( "Name", '^9$') THEN 'R,TR'
-		WHEN regexp_match( "Name", '^Finish$') THEN 'L,BL'
-		WHEN regexp_match( "Name", '^Start$') THEN 'R,BR'
+		WHEN regexp_match( "Name", '^Finish$') THEN 'BL,L'
+		WHEN regexp_match( "Name", '^Start$') THEN 'BR,R'
 	END
 END
 ```